More changes

initial comment
22