Final Update for 1.7 I hope