updating to chiara fixes and new triggers