update for new context object