Update from Issue #236

New code to move away from limitations of Get-VIEvent