Include Tom's latest corrections
Include Tom's latest corrections