Made temp viewing work (more edge cases to be tested)