Added Andres' Edits