add Chris' changes