Started preparing for taking empty lists into account