Adjusted for changes made to VIGOR.py just now.