Changes made by Matt and Larry in pursuit of multi threading