Added Alejandro's alterations