adding Chris' stuff