More changes

initial comment
29