Final v3 changes for deploy