updated for viewer 2.3.0