Major rehaul of protections