slight changes and comments etc