Mayor rework