Update on trigger code (Rachid)