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