Update for 1.7 (prelim)
Everyone should work on the same version
Fix to work with 1.6