Added code to use Default.settings