More tweaking of my own.