Slight tweak to listeners