fixed movement, added conversion