Simplified the parsing of the 2nd argument
Removed the debug command after the command parsing