major style changes and diff content