wip/crrcsim/patches
