moved more code into the move command