huge update for VO stuff.