update for Viewer2D changes