Avatardata optimization

Optimizations from last week.