Incorporated first Cristina and Boris comments