Fixed major bug in new command, will add later