rebased with next