Final version of 2.0