Added ORI and CMPI. Fixed bug in move.