New version from Vinaj, should solve the threading problems (hopefully).