More changes

initial comment
15