Updated settings (Andrea)