They didn't exactly kiss and make-up but there was a manly hand shake between Louis Walsh and Gary Barlow to kick of week two of the live X Factor shows 2012
After the two men had vowed to put the past behind them, we got onto the business of the night, songs in key of love and heartbreak from all 12 finalists
Jahmene Douglas was first, storming through Ain’t No Mountain High Enough and Amy Winehouse’s Tears Dry On Their Own in a sharp white suit and co-respondent shoes.
The judges were unanimous. An impressed Gary Barlow admitted: “Loved the outfit and the whole Motown thing.”
Look back on Jahmene’s performance.
The love-in didn't last long. Wildcard Christopher Maloney divided the panel after an emotionally charged interpretation of 80s anthem Alone by Heart.
Louis said: “It was very cruise ship, very cabaret Gary. It was a lazy song choice.” But Gary defended his boy, arguing back: “Changing you is not the way to go. You are perfect just as you are.”
What do you think? Check out Christopher Maloney's performance again.
J took on a remix of Leona Lewis’ Bleeding Love and James’s Morrison’s Broken Strings, and nailed it, with Gary telling the boys they were “a total transformation from last week”.
Ella Henderson took on Minnie Riperton’s classic Lovin’ You with those amazing high notes. Looking much older than her tender years in a full length ballgown, she had Nicole praising her “timeless” beauty and talent".
James Arthur was inspired to pour his heart and soul into his performance of No More Drama after Mary J. Blige herself had offered some advice. And the judges were impressed.
Were you? Check back on James’ performance.
Meanwhile singer-songwriter Lucy Spraggan surprised viewers at home by changing tact and taking on Kanye West’s Gold Digger.
Lucy revealed she had in fact chosen an upbeat number to stop people feeling sorry for her after the death this week of her beloved grandmother.
Can a leopard change sports? Watch her again and decide for yourself.
The judges continued their war of words when it was District3’s turn to take to the stage, with Gary tearing into them: "The song choice was really dated and I’m very disappointed for you", he said.
Was he right? Watch District3’s performance again.
Jade Ellis slowed down the pace of the night with her gorgeous rendition of Amy Winehouse’s Love is a Losing Game. and the judges loved it. Louis said: “You are in a very tough category but I think you are incredible.”
Look back on Jade’s performance.
But it was thumbs down for hip hop duo MK1 who gave the Jackson 5 classic I Want You Back an urban mix.
Gary was at it again, saying: “It’s gone a little bit too Glee for me this week.”
Do you agree with the Judges? Check out the performance again.
The fire wasn’t quite there for Kye Sones either. Nicole simply said: “It didn’t grab me.”
Watch Kye’s performance again.
After last week's excitement, Rylan Clark wasn't going to leave it alone and started with a line from Take That’s Back for Good. Then he had the cheek to stop, tell Gary that was "just for you" and launched into Groove is in the Heart, Gangnam Style and Pump up the Jam complete with dancing pandas.
Unsurprisingly Gary was not impressed. Have another look at Rylan’s performance.
It was down to Scottish favourite Melanie Masson to close the night, and she did with aplomb to Love Will Tear Us Apart.
Tulisa was so impressed she forgot herself and told Melanie she was in "full MILF mode". If you don't know what means, don't ask. Check out Melanie’s stunning performance.
With the public now voting on their favourite singers it’s a tough call to make over who will go home on Sunday night’s show.
All the X Factor performances are available to download from iTunes.