Manuel Buenrostro

Hey everyone My 4.8 finally blew out after 360k miles, since imma need to replace the motor, I thought I might as well switch to a 5.3 since they're cheap and readily available at my local junk yard. I'm planning on getting one from the same year truck (99-02) along with the computer from whichever truck I pull it from to avoid having to flash my current pcm. Will i have any problems passing smog if I go this route? I know that as of July this year they've started checking your ecu for tunes. Im hoping if I swap my 4.8 computer with the factory 5.3 it shouldn't be a problem since it'll be the original one that came with the engine.