#859: Viewer Calls

#859: Viewer Calls