diff --git a/nvdaAddon/manifest.ini.in b/nvdaAddon/manifest.ini.in
index 4e2d931..6ae9883 100644
--- a/nvdaAddon/manifest.ini.in
+++ b/nvdaAddon/manifest.ini.in
@@ -4,4 +4,4 @@ description=A free Klatt-based speech synthesizer
 author=_author_
 version=_version_
 minimumNVDAVersion = 2019.3.0
-lastTestedNVDAVersion = 2019.3.1
+lastTestedNVDAVersion = 2020.4
diff --git a/nvdaAddon/synthDrivers/nvSpeechPlayer/__init__.py b/nvdaAddon/synthDrivers/nvSpeechPlayer/__init__.py
index 3e84c99..0ba72c8 100644
--- a/nvdaAddon/synthDrivers/nvSpeechPlayer/__init__.py
+++ b/nvdaAddon/synthDrivers/nvSpeechPlayer/__init__.py
@@ -1,7 +1,7 @@
 ###
 #This file is a part of the NV Speech Player project. 
 #URL: https://bitbucket.org/nvaccess/speechplayer
-#Copyright 2014 NV Access Limited.
+#Copyright 2014-2021 NV Access Limited, Ty Gillespie.
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License version 2.0, as published by
 #the Free Software Foundation.
@@ -26,11 +26,10 @@
 from logHandler import log
 from synthDrivers import _espeak
 from synthDriverHandler import SynthDriver, VoiceInfo, synthIndexReached, synthDoneSpeaking
-from driverHandler import NumericDriverSetting
-
+from autoSettingsUtils.driverSetting import NumericDriverSetting
+from speech.commands import IndexCommand, PitchCommand
 
 class AudioThread(threading.Thread):
-
 	wavePlayer=None
 	keepAlive=True
 	isSpeaking=False
@@ -153,8 +152,8 @@ def check(cls):
 	supportedSettings=(SynthDriver.VoiceSetting(),SynthDriver.RateSetting(),SynthDriver.PitchSetting(),SynthDriver.VolumeSetting(),SynthDriver.InflectionSetting())
 
 	supportedCommands = {
-		speech.IndexCommand,
-		speech.PitchCommand,
+		IndexCommand,
+		PitchCommand,
 	}
 
 	supportedNotifications = {synthIndexReached,synthDoneSpeaking}
@@ -183,7 +182,7 @@ def speak(self,speakList):
 		for item in speakList:
 			if isinstance(item,speech.PitchCommand):
 				pitchOffset=item.offset
-			elif isinstance(item,speech.IndexCommand):
+			elif isinstance(item,IndexCommand):
 				userIndex=item.index
 			elif isinstance(item,str):
 				textList=re_textPause.split(item)