finished 6.3.4