working build v2.0