merging with kevin's lost some of my changes, putting them back in