Should we try adding the chunk listeners as well?