Added some more code about Motion