More changes

initial comment
21