edited to allow extended lists