Merging Yaneli last changes to my branch