all changes requested by Etienne