The final episode of Smackdown before WrestleMania 33 had one final spanner to throw into the works as a former champion returned to the show.
While the contract signing between Shane McMahon and AJ Styles, the clash of former allies Bray Wyatt and Luke Harper and a reveal of 10 superstars entering the Andre the Giant Memorial Battle Royal all grabbed headlines, one shock return really stole the show.
A chance at redemption on home turf
Following the conclusion of a women's tag team match which saw Becky Lynch team with Mickie James to take on Carmella and Alexa Bliss, Natalya - who had been watching at ringside would interject herself into an all out brawl.
SIGN UP NOW
Will Naomi recapture the title at WrestleMania? Have your say by signing up now to become a GMS writer: http://gms.to/haveyoursay4
A very one-sided battle as the three heel women outmatched the two face superstars, the music of former Smackdown Women's Champion Naomi would bring the fans to their feet.
Naomi has been absent from Smackdown since having to hand the title back to General Manager Daniel Bryan due to injury over a month ago.
She returned on Tuesday night however to a loud reception from the WWE fans in attendance.
Naomi would clear the ring and show just how the former champion has certainly returned to health.
She would then go on to confirm that she will not only be at WrestleMania on Sunday, but she officially declared herself for the Smackdown Women's Championship match.
Naomi won the Championship at Elimination Chamber in February, but was forced to relinquish the title two days later on Smackdown due to a knee injury.
That injury put her hopes of performing at WrestleMania in her home town of Orlando, Florida in serious doubt.
She may not be entering WrestleMania as the champion as she had hoped, but she has a very real chance at leaving Sunday's event with the belt.
Naomi's return leaves a lot of questions surrounding Smackdown's Women's Championship match on Sunday, but one really dominates them all.
What will the women face?
This Sunday, Smackdown Women's Champion Alexa Bliss will put her title on the line against every eligible woman on the Smackdown roster.
As has been pointed out by the commentary team in the last few episodes of Smackdown however, there has still been no definition of what the rules of the match will be.
It could be an elimination match, an over the top rope match or a gauntlet match, so many questions have been left unanswered about the Smackdown Women's match for WrestleMania.
There are constant rumours of a debut for NXT Champion Asuka in the match alongside Tuesday's big reveal of Naomi, right now the only thing for sure about the match on Sunday, is that it will feature on the WrestleMania pre- show.
Who will leave WrestleMania as the Smackdown Women's Champion? Have YOUR say in the comments section below and if you want to hear our WWE writers' expert opinions on WrestleMania 33, take a listen at https://soundcloud.com/user-818579649/gms-wwe-podcast-wrestlemania-33-special