updated to work with 1.8.0 viewer