Added final version of version 2.0