Last enhancements towrds a merge