updated from erin's branch