Found a few bugs when doing the demo video