added completeEvent support