Complete rework (again)