Updated simple viewer