eric's modifications
panos modifications