Update #22

I had already forced push.. This I think has the changes that I did this
morning.