Rework for latest version