Merge in Chris' changes