Feature/gts plugin change

same as anubis pull request.  Please test.