modified to cover election events