Added Alejandro's changes