More changes to the viewer