Update to 7.0

Update to 7.0