Fourth commit with Viewer implented without sorting