More control logic