bring in latest from jon thornton