nuevos cambios, generando listados, we are almost there
fixing merge