Rework Solution & Step