More changes

initial comment
2