Fixed bug in assembling timepoints, use ordered list and not the hashmap