control logic changes (partial)