Update 5 and 7