More logic in control logic

Top