pulled in more thrax changes