finished 1.2.6