changes from removing zk, just translate over the old stuff and change later