rework, again!