re-routing and added some cmds