rework everything