Completed 1.7