More changes

initial comment
18