changed names
started integrating list type