Added ability to control the command