Prepare to split regen to more ticks too