last update with Noel and Maxim comments