Chris' changes