Merge pull request #482 from ZappoMan/avatardata_optimization

Avatardata optimization