Ahead of its upfront presentation to advertisers—where the network will formally introduce its programming slate for the 2015-16 broadcast season—Fox previewed a pair of major additions to Empire’s second season. First up: More episodes, expanding on season one’s 12-episode run to encompass a two-part, 18-episode season two, meaning you can get the “Drip Drop” hook stuck in your head during the fall of 2015 and the spring of 2016. Deadline also reports that R&B star and Empire superfan Ne-Yo will contribute new songs to season two, joining a team that already includes executive music producer Timbaland. Ne-Yo and Timbaland previously worked together on the 2012 single “Hands In The Air”; Empire marks the pair’s first collaboration that could wind up lodged in the Amy Winehouse-impersonating throat of Courtney Love.