avatar mixer fixes - using shared AvatarData class