add 3rd party stuffs back