status before merge with Elie's work