added some new commands
fixed conflict