Improved some listeners