Upstream Tristo view 2