Safety and security upgrades