added Eric's stuff