should take in all commands now
fixed