Replaced depreciated control loops