major changes to viewer