Updated to new viewer