Added Changes from C. Villanueva
update