Reworked commanding logic