Slight Changes to myemotion and mapemotion