solve no7 and fixed no2