did some command restructuring