Changed settings handling. ...again.