Fix how vision works
Merge remote-tracking branch 'origin/vision'