Readjusted listener structure