More self (28/31)

More self