closer and closer to final version