Minor changes for Chris to stare at.