Updating v1 implementation.