updated to ID Gen 2.5 and Event 2.1