Added some new functionality to simulate command