Updated with Settings.java