changing command name, cleaning code logic, adding two new options