modified list generation methods

Modified the way the lists are generated