revamped the event selection