Updated with current settings