Changed the way the list is constructed