changes following review #875