Porting twowayview's update