Add taker1
add-emote fix