changes requested by Eduardo