Esperanza's code

merge Esperanza's code in