switch to command module where possible