Changed how triggers work