Finished 1.7 update