make changes by Thomas
more changes by Thomas