Adding WaitEvent
Revert "Adding WaitEvent"

This reverts commit 15898e982643c246d5c0cd99574f71a813228438.