readyToTakeOverFixes