Mayor improvements while working on it 9 months ago