Updated for avatar