Final version: 2.0