changes for v3 code