More changes

initial comment
30