updated with update war that allows you to set the context