Updated with variable settings