Update Eric, Johann and TianCe collate