Added more of Alejandro's changes
Fixed Alejandro being bad