Massive changes while I look at what I wrote in a sleep-deprived state