some adjustments
added handling of contemporary events