Dulce please review and merge my changes