Update to v7
Fix prelim errors