Listner added and works properly
Revert "Listner added and works properly"

This reverts commit 7f86002f5325162605125c57f7f5cb5627958af2.