Upgrading thread branch to work with new server