Changed to use commands from commandLib