engine swap

Hey everyone... So I am in search of a replacement engine for my 2004 ZX10r but I have been having trouble finding a complete motor for the '04/'05 model...however, I have found a bunch for the '06/'07 model. I want to ask if anyone knows if the new model engine will fit correctly in the '04...