updated control setup