slight changes following RPs recent comments