Doc remarks from Wim