Updated Settings to work correctly