Changed the behavior of the list generation.