This will need some more checking. And maybe also adding *force second stage* as we are about to remove it by default.