better comment
avatar management