Adding additions for new 2D viewer