Rework completely