More changes

initial comment
17