updated to work with viewer 1.8.0