refactor pub on context team