V0.6 Triggers added