Renamed some things and added some control code