Yes. Just completed this swap. I have 99 Cobra that had a hole in the block from a broken rod. Bought 04 Aviator engine from junkyard. As previously stated, you will have to strip the aviator engine. I didn't swap heads, Aviator heads are suppose to be better. Use your 01 oil pump pickup and oil...