adding clean exiting and expanded events shown