rework on a problematic class...