Update to 1.7 (not yet finished, but works)