Added trigger assignment. COMPLETE