Enable the listener to carry some state
Fix the silly