First working version of V2.0