Added some more changes to SettingUp