Integrate changes by Tom