update , 7 and 8