rework for easy demo