Changes to externalise settings - UNTESTED