slight changes following RPs comments