Revised control/setup