modify command class for all case