And some update to Settings File