Temp changes to TagListener class.