More changes

initial comment
23