CHG: Avatar
some changes