rework for consistency