added Esmeralda's work