replaced avatar notification mechanism and avatar reset function
resolved conflict