Added non-interrupting bounday events.