Oh yeah, split 3 relatively minor changes on 6 pages :/