some changes to emote