Major changes to how triggers are dealt with