refactoring lists
merge with master
generate ordered times