added and removed events now calculated correctly