Removed GoldenView calls because