Reinstated bootstrap_and_overrides