Added moar of Alejandro's changes