Massive changes to control