Will a 95' 4.0 fit into a '99
 

I post earlier today about my 99' Xj, I basically trashed the engine. I just found out that my uncle has a 95' Zj with a 4.0. Will this swap work? I could really use some good news here...

First thing that came up on google.

Questions about swapping different year/model 4.0s
XJ Cherokee and ZJ Grand Cherokee 4.0L engine blocks interchange.

2000+ TJ Wrangler and WJ Grand Cherokee 4.0L engine blocks interchange.

XJ/ZJ blocks and 2000+ TJ/WJ blocks do not interchange without significant modifications. (1991 to 1995 YJ and 1997-1999 4.0L TJ Wrangler blocks will interchange in XJ/ZJ and visa-versa).

TJ/WJ 4.0L Engine blocks underwent clean sheet design changes effective in the 1999 WJ Grand and 2000 TJ Wrangler. These blocks are not interchangeable with XJ/ZJ engine blocks. The reason is motor mount bolt holes and belt driven accessory mounting bolt holes are in different locations, or not present at all, TJ/WJ vs. XJ/ZJ.
　
XJ: "Regular" (not Grand) Cherokees 84-01
ZJ: Grand Cherokee 93-98 (Gen1)
WJ: Grand Cherokee 99-04 (Gen2)
YJ: Wrangler 87-95 (Gen1)
TJ: Wrangler 97-06 (Gen2)

I had see this on other threads and just wasn't quiet sure how to read it. So it will work. I know I will have to compare the engines side by side and make sure everything matches up. Anyone have an extra advice before I jump into it?