SOME SETTINGS ADDED