Update 11.7 (combining 2 files)