remade move method.  left old code in comments if the changes are not
liked.