Modified move method