Content changes applied from Hinricks suggestions