one_step_occ fix needing review still