Finish 1.7 update