normalized Arnaud's changes