Added listeners to demo