postcontext refactor completed