more changes for in-context prototype