Upgraded to 1.7