Eric's stuff added