If you’re a OnePlus 3 owner, you’re probably a little concerned that your device is about to be refreshed just five months after making its debut. But there is some good news: OnePlus has confirmed the original OnePlus 3 will get Android 7.0 Nougat before the end of 2016.

Nougat made its public debut almost three months ago, but like a lot of major Android upgrades, it has been slow to reach third-party devices. Fortunately for those with a OnePlus 3, the wait for Android 7.0 will soon be over.

Brian Yoon, head of software for OnePlus, has confirmed to Engadget that a Nougat “community” beta will be rolling out to the OnePlus 3 this month. OnePlus will then iron out any kinks before a final, public release is distributed to all handsets before the end of the year.

Yoon also revealed that OnePlus plans to update some older devices, such as the OnePlus 2. However, there is no timescale for their Nougat updates just yet.

Nougat comes after OnePlus shakeup

Nougat will be the first major Android release from OnePlus since a major shakeup of its software teams.

The Chinese startup merged its HydrogenOS division (which developed software specifically for China) with its OxygenOS division (which developed software for everywhere else) earlier this year. It hopes the change will allow it to be more efficient with software upgrades.