removed rebasing from planning section