Added Mike'slatest enhancements.