continued work separating local settings