Changes for new single list format

Changed/added/removed funtions to allow for new list format.