current state of rework for next version