changing things as per marcos' and ernesto's request