changes to make static viewer work