intermediate push of switching to new scheme