UPDATE: Working on main list