Re-wrote the command