merging Patrick Stamp corrections