Update 7 and 8