changes from Ovidio Pena-Rodriguez