Applied minimal changes