Further command revamping