Update #3

- Forgot to register the listener.
- Small changes.