Added Triggers to final handin