Initial replan

First stage of the construction of the extension