merge Adriana's updates