avatar state part 2

Modified