Slight changes and additions