made a few changes. I am losing track of what I have done