Minor updates to my way of thinking...