added ability to set context