Improved viewer