added context listener