added the other analyze event cue
removed deprecated code