Fixing old code and adding voice control