improve emo mapping