updated context calls