More changes

initial comment
28