TODO update and some ShapedVector