improvement made to the viewer lag. Not clean yet