refactor.
temp commit for activation Listener.