Cleaned up trigger section