simplified stuff
changed command names