avatars added and restructured