Updated to use real event info