moved listener to container