finished 3.6 & 3.7