More changes

initial comment
16