updated variables and included C1 and C2 controllers