Moved v1 implementation to zOLD