Updated to 1.7, hopefully (untested yet).