Updated with newest settings