slight changes before merge into master