Finished 3.3 and 3.4