re sorting out 2 year bug for events- improved workflow