v0.6.2. changes applied