started checking events on the timespan but merging in master