Added Proper Settings