did not add all that I needed

Pull in all of the changes I had intended to with the past post.