Fixed triggers flow, Added 2 new Triggers