Reduced number of lists - only list of all units now