Viewer Intergration phase I changes