Updated viewpoint-triggering code. Exchange server is down so can't currently test. #4