More changes

initial comment
24