added changes for v1