retrofit from upstream