This should be the failsafe.
A few changes to allow for better overrides.