Added event list to #when, incorporated Lee's feedback