Listeners arrays changed to single listeners