Refactoring
Refactoring, added listeners