Change listener structure quite a bit