improve the commands' CS