style changes
merge with henri