Added Changes from C. Villanueva