Changed the commands to be better