Incorporating more of Hinrick's content changes