V6 update

Preparing for V6 update