Made jeremys changes