Continuing the rework...