jtong - add go through for context