Improving ZK implementation.