NBC’s Will & Grace revival has been extended beyond the 12 episodes fans were promised.

WILL & GRACE REBOOT EXTENDED TO TWO SEASONS

Now four more episodes have been added to the new season, as well as an additional follow-up season. “You heard it right!” Four additional episodes for the upcoming season, and another season on the way. #WillAndGrace,” wrote the sitcom’s official Twitter account.

Eric McCormack and Debra Messing star as the titular duo, with friends Jack (Sean Hayes) and Karen (Megan Mullally) as their adorable best friends. The original series ran from 1998-2006 and ended with Will and Grace each with husbands and kids. The new season will start off just before all that happens, though Grace’s beau Leo, played by Harry Connick Jr. will reprise his role.

NBC Entertainment Chairman Bob Greenblatt is excited for the reboot. “There’s been such an outpouring of love from the fans,” he said. “We’re a very grateful network and we’re more than thrilled to have this show for a minimum of two seasons.” Messing chimed in that she was thrilled to get back to Grace. “It felt like coming home and we laughed so hard,” she said of their table read this week. McCormack said the early decision for a second season was “a no-brainer… It’s a beautiful crazy thing that happened.”