Added moars of Alejandro's changes