Adding all the changes made for PDXGo