Update For Listeners

Another Update For Death and Leave Listener