Incorporating Katy Huff's overnight changes (plus a few of my own)