Updated for multiple settings