If you ever decide to change u-joints, I highly recommend a tool like the following. There are multiple brands, Tiger Tool is the original, but I could not wait for them to get them in stock, so I went with oemtools. Works very well.