fixing current and upcoming events