changed some refrences and added some new ones