merged with erikas branch I think