Updated move method