Added listeners back in for now