Harry: more slight changes