More random listerner changes, not tested yet.