More changes

initial comment
27