added in the rest of the settings