diff --git a/Changelog b/Changelog
index 4ada7493e..9d7792013 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-12-05 DariusIII
+	* Chg: Update amazon usage for new apai-io version
 	* Chg: Change semantics for $this->renamed
 	* Chg: Update exeu/apai-io to version 2
 2016-12-04 DariusIII
diff --git a/misc/testing/Tests/test_amazon_API.php b/misc/testing/Tests/test_amazon_API.php
index 5ef2ed827..7ca5ee19e 100644
--- a/misc/testing/Tests/test_amazon_API.php
+++ b/misc/testing/Tests/test_amazon_API.php
@@ -1,16 +1,16 @@
 <?php
 require_once realpath(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'bootstrap.php');
 
+use ApaiIO\ApaiIO;
 use ApaiIO\Configuration\GenericConfiguration;
 use ApaiIO\Operations\Search;
-use ApaiIO\ApaiIO;
-use nntmux\db\DB;
+use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
+use app\models\Settings;
 
-$s = new DB();
 
-$pubkey = $s->getSetting('amazonpubkey');
-$privkey = $s->getSetting('amazonprivkey');
-$asstag = $s->getSetting('amazonassociatetag');
+$pubkey = Settings::value('APIs..amazonpubkey');
+$privkey = Settings::value('APIs..amazonprivkey');
+$asstag = Settings::value('APIs..amazonassociatetag');
 
 $conf = new GenericConfiguration();
 $conf
@@ -18,15 +18,16 @@ $conf
 	->setAccessKey($pubkey)
 	->setSecretKey($privkey)
 	->setAssociateTag($asstag)
-	->setResponseTransformer('\ApaiIO\ResponseTransformer\XmlToSimpleXmlObject');
+	->setResponseTransformer(XmlToSimpleXmlObject::class);
 
 $search = new Search();
 $search->setCategory('VideoGames');
-$search->setKeywords('Guilty Gear 2 Oveture');
+$search->setKeywords('Deus Ex Mankind Divided');
 $search->setResponseGroup(['Large']);
 $search->setPage(1);
 
 $apaiIo = new ApaiIO($conf);
 
 $response = $apaiIo->runOperation($search);
+
 var_dump($response);
diff --git a/nntmux/Books.php b/nntmux/Books.php
index f97aa7276..37a5f830c 100755
--- a/nntmux/Books.php
+++ b/nntmux/Books.php
@@ -1,6 +1,7 @@
 <?php
 namespace nntmux;
 
+use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
 use app\models\Settings;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
@@ -343,7 +344,7 @@ class Books
 				->setAccessKey($this->pubkey)
 				->setSecretKey($this->privkey)
 				->setAssociateTag($this->asstag)
-				->setResponseTransformer('\ApaiIO\ResponseTransformer\XmlToSimpleXmlObject');
+				->setResponseTransformer(XmlToSimpleXmlObject::class);
 		} catch (\Exception $e) {
 				echo $e->getMessage();
 			}
diff --git a/nntmux/Console.php b/nntmux/Console.php
index 751ddea5c..6e6c835ef 100755
--- a/nntmux/Console.php
+++ b/nntmux/Console.php
@@ -1,6 +1,7 @@
 <?php
 namespace nntmux;
 
+use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
 use app\models\Settings;
 use nntmux\db\DB;
 use ApaiIO\Configuration\GenericConfiguration;
@@ -718,7 +719,7 @@ class Console
 				->setAccessKey($this->pubkey)
 				->setSecretKey($this->privkey)
 				->setAssociateTag($this->asstag)
-				->setResponseTransformer('\ApaiIO\ResponseTransformer\XmlToSimpleXmlObject');
+				->setResponseTransformer(XmlToSimpleXmlObject::class);
 		} catch (\Exception $e) {
 			echo $e->getMessage();
 		}
diff --git a/nntmux/Games.php b/nntmux/Games.php
index 1bb9c23e7..fa3a89d76 100755
--- a/nntmux/Games.php
+++ b/nntmux/Games.php
@@ -394,7 +394,7 @@ class Games
 	}
 
 	/**
-	 * Process each game, updating game information from Giantbomb
+	 * Process each game, updating game information from Steam, Giantbomb, Desura and GreenLight
 	 *
 	 * @param $gameInfo
 	 *