Updating return commands for exit commands