Accidentally broke original viewer for Naive version.