Added triggers

JP's and JC's work