more work on live viewer