Harry: slight changes from snag list