added support for motion in emotion !