CFY-642 finish adding events