Changed how listeners work