changes by billchen1977