Update: new scheme