beta version
changes requested by Kevin and Cara