Choreographer-turned-filmmaker will shift into Shah Rukh Khan's new office space in Khar, to start work on their new film

Now that Shah Rukh Khan and Farah Khan are buddies again, it comes as no surprise that the choreographer-turned-filmmaker will soon move into the former's spanking new office space in Khar.

The two fell out over Tees Maar Khan and then Farah's hubby Shirish Kunder and SRK had a full-blown jhagda at Sanjay Dutt's party in January. But post that, Farah and SRK met up to sort out the issue. Then came the news that the two buddies were going to work together on Happy New Year.

The buzz is that Shah Rukh is taking their friendship to another level, by asking Farah to move into his new office building in the Mumbai suburbs to start work on their film.

Our source confirms, "Yes, Farah has been asked to move into the office. The actual move hasn't happened yet. An entire floor has been set aside in the building just for Happy New Year."

The source also adds, "When Shah Rukh had started work on the building, he had reserved a big office space just for Farah."