done revision of 1.6, 1.7, 1.8