Rework for visibility