More changes

initial comment
19