command wrapper changes