update based on comments from Jerome
merged