WIP replace raft