Adding Changes from Alizano