Optimised the base settings stage slightly.