GOR - Safety upgrades