Final steps regarding newInfrastucture