More changes; Almost done