Changed Viewer to use transform