Rework #7