Lots of Changes ... still lot more to do