Added ability to collate different conditions.
Fixed some bugs with collate