Updated code to match tests (support show events)