added support for no upcoming events