Emergency controller mods from the previous checkin