Rework for testing