Planning Towards A Smooth Transition