Refactor

ZK ref?