Huge set of changes. To many to list.