Made changes to allow multiple events