moving some raft stuff around