Changed the way commands work