update to 8_1 and finished 8_2