OnePlus today announced that they will start rolling out the Cyanogen OS 12 update for the OnePlus One on or before March 30, 2015. The company had initially promised to update the One to Lollipop within 90 days of the code being released by Google, but could not keep up its word.

It was only late last month that OnePlus announced the delay in the rollout of the final builds of Cyanogen OS 12 and OxygenOS to late March.

Additionally, the company also announced that it will be releasing its Lollipop based OxygenOS ROM on or before March 27, 2015. This new ROM will not be available as an OTA to OnePlus One users, and instead interested users will have to flash it manually on their device.

As for the reason behind the delay in the rollout of the Lollipop update for the One, Bradon H from OnePlus revealed that the delay was caused due to some “unexpected roadblocks.” This includes an unforeseen OS signing issue, stability issues of the camera module on Lollipop, and other major system drivers requiring an update to work with the latest version of Android.

To show that the company is serious about the rollout this time, it also announced that if it misses either of the deadlines, it will give away five 64GB units of the OnePlus One to its users.