pulled from laurie and sarah
starting second app
conflict fixed