Upgrading to 1.6