Samsung on Tuesday sent out an update to let customers know over half a million replacement Note 7 units have been shipped to U.S. carrier and retail locations. If your device was part of the recall, you should have a new one in your pocket no later than Sept. 21.

In addition to sending out new units, Samsung is also introducing a software update that will indicate to customers these new units come equipped with batteries not affected by the recall. According to the U.S. Consumer Product Safety Commission, all Note 7 units purchased before Sept. 15 should be powered down and returned immediately to the carrier or retail store it was purchased from.

“Working hand in hand with the CPSC, we are delivering as promised and moving quickly to educate consumers about the recall and make new Note 7s available,” said Tim Baxter, president of Samsung Electronics America. “New devices will be in stores no later than tomorrow and we will continue to take the necessary actions to ensure users are powering down and immediately exchanging recalled devices.”

Earlier this month, Samsung announced an unprecedented voluntary recall of the Galaxy Note 7 following reports of exploding batteries. Two weeks later, and the CPSC announced its own recall of the device, urging customers to power the device down and cease use. To see if your Note 7 is affected by the recall, you can check using Samsung’s device check portal.

New customers hoping to get their hands on the Galaxy Note 7 will reportedly have to wait until the end of October before carriers and retailers begin selling the device again.