merged with kevin's stuff