UPDATED to the latest thirdparty dependencies