Added crude version of listeners