removed switch and using commander command