SUA SPONTE NON-FINAL ORDER DISMISSING WITHOUT PREJUDICE MOVANT’S MOTION TO VACATE (D.E. 5)
THIS CAUSE is before the Court on Movant Gregory King’s Second Motion to Correct Sentence pursuant to 28 U.S.C. § 2255, (“Motion,” D.E. 5), filed June 24, 2016. Magistrate Judge Patrick A. White issued a Report and Recommendation (“Report,” D.E. 9) on June 30, 2016, recommending that the Court grant the Motion on the basis of the parties’ joint stipulation. For the reasons stated herein, the Court dismisses Movant’s Motion to Vacate and rejects the Report as moot.
*1349I. Introduction
On August 31, 2007, Movant was adjudicated guilty of being a felon in possession of a firearm in violation of 18 U.S.C. § 922(g)(1). See United States v. King, 07-20253-Cr-Lenard (S.D.Fla. Aug. 31, 2007) (D.E. 25). The Court sentenced Movant under the Armed Career Criminal Act (“ACCA”), 18 U.S.C. § 924(e), to 180 months’ imprisonment, to be followed by four years of supervised release. See id.
An individual adjudicated guilty of being a felon in possession of a firearm under 18 U.S.C. § 922(g) is subject to a maximum sentence of ten years’ imprisonment. 18 U.S.C. § 924(a)(2). However, if the defendant has three prior convictions for a “violent felony or a serious drug offense,” the ACCA enhances the sentence to a mandatory minimum fifteen years’ imprisonment. 18 U.S.C. § 924(e)(1). The ACCA defines the term “violent felony” as any crime punishable by a term of imprisonment exceeding one year that:
(i) has as an element the use, attempted use, or threatened use of physical force against the person of another; or
(ii) is burglary, arson, or extortion, involves use of explosives, or otherwise involves conduct that presents a serious potential risk of physical injury to another[.]
18 U.S.C. § 924(e)(2)(B). Subsection (i) is referred to as the “elements clause”; subsection (ii)’s first nine words are referred to as the “enumerated clause”; and subsection (ii)’s final thirteen words are referred to as the “residual clause.” See In re Rogers, 825 F.3d 1335, 1338 (11th Cir.2016).
In Johnson v. United States, the United States Supreme Court held that the ACCA’s residual clause is unconstitutionally vague. — U.S. -, 135 S.Ct. 2551, 2563, 192 L.Ed.2d 569 (2015). In Welch v. United States, the Supreme Court held that Johnson announced a new substantive rule of constitutional law that applies retroactively to cases on collateral review. — U.S. -, 136 S.Ct. 1257, 1268, 194 L.Ed.2d 387 (2016).
Movant argues that after the Supreme Court’s decision in Johnson, he no longer qualifies for an enhanced sentence under the ACCA. (Mot. at 2.) Accordingly, he seeks an Amended Judgment imposing a sentence of 120 months’ imprisonment. (Joint Stipulation, D.E. 10 at 3.)
II. Background and Procedural History
On June 15, 2007, Movant pleaded guilty to being a felon , in possession of a firearm in violation of 18 U.S.C. § 922(g)(1). See King, 07-20253-Cr-Lenard (D.E. 18). At the time of sentencing on August 31, 2007, the Presentence Investigation Report (“PSI”) recommended that the Movant receive a sentence enhancement pursuant to the ACCA, 18 U.S.C. § 924(e),1 and identified all of the Movant’s prior convictions.2 *1350Neither the Government nor the Defendant objected to the PSI.3 At the sentencing hearing, the Court first adopted the factual findings and guideline applications in the Report and then sentenced Movant as an armed career criminal pursuant to the ACCA, the PSI and the governing law.4 No explicit findings were made on the record at the time of sentencing as to whether the residual, enumerated or elements clause (or any combination thereof) applied to Movant’s predicate offenses.
On October 9, 2008, Movant filed his first Motion under 28 U.S.C. § 2255 to vacate his sentence. See King v. United States, 08-22820-CV-Lenard (S.D. Fla. Oct. 9, 2008) (D.E. 1). Magistrate Judge White entered a Report and Recommendation (08-22820, D.E 11) on February 9, 2009, recommending dismissal of Movant’s claims as time-barred, and alternatively, denial of Movant’s claims on the merits. Judge White agreed with Movant that his strong-arm robbery conviction did not qualify as a predicate offense under the ACCA—but noted that Movant had at least three other convictions that counted as predicate offenses.5 (Id.) Movant filed two sets of objections to Judge White’s Report, arguing that: (1) his Motion was timely; (2) strong-arm robbery does not qualify as a predicate offense under the ACCA; (3) grand theft does not qualify as a predicate offense under the ACCA; and (4) his convictions for grand theft (F01-18843), distribution of cocaine (F01-013037 and F01-013038) and possession of a controlled substance (F01-030566) all occurred on the same day and thus may only qualify as one ACCA predicate offense. (08-22820, D.E. 12 and 14.) On April 8, 2009, Movant filed a Supplemental Objection, arguing that his burglary conviction did not qualify as “generic burglary” and therefore could not be counted as an ACCA predicate. (08-22820, D.E. 15.) On June 5, 2009, this Court overruled Movant’s objections, *1351adopted Judge White’s Report and denied Movant’s first 2255 Motion. (08-22820, D.E. 18). The Court also denied Movant’s Motion for a Certificate of Appealability. (08-22820, D.E. 22) Movant appealed the Court’s decision to the Eleventh Circuit which also denied him a certificate of ap-pealability. (08-22820, D.E. 33 and 34.)
After the Supreme Court issued its decision in Welch, 136 S.Ct. at 1257, Movant filed an application under Section 2255(h) seeking permission from the Court of Appeals to file a second or successive 2255 motion. On June 16, 2016, the Eleventh Circuit granted Movant’s application to file a second or successive 2255 motion, finding that because the District Court made no explicit findings at the time of sentencing “King [ ] met his burden of making a pri-ma facie showing that his application contains the rule announced in Johnson and that he is reasonably likely to benefit from that rule.” (D.E. 1 at 9.) On June 24, 2016, Movant, who is now represented by counsel, filed his second 2255 Motion. (D.E. 5.)
Movant argues that since, the Supreme Court declared the ACCA’s residual clause unconstitutional, see Johnson, 576 U.S. -, 135 S.Ct. 2551, 192 L.Ed.2d 569, an insufficient number of his prior convictions now qualify as “violent felonies” or “serious drug offenses.” Movant concedes that one of his drug distribution convictions is a predicate offense under the ACCA, but argues that none of his other convictions qualify under the ACCA’s elements or enumerated clauses. Movant bases his assertion on his legal assumption that Descamps v. United States, - U.S. -, 133 S.Ct. 2276, 186 L.Ed.2d 438 (2013) and Mathis v. United States, — U.S. -, 136 S.Ct. 2243, 2257, 195 L.Ed.2d 604 (June 23, 2016), apply retroactively when determining whether his prior convictions constitute predicate offenses under the ACCA’s elements and enumerated clauses. The Government initially accepted this legal assumption in its Response and Stipulation—without any legal citation or analysis.
On June 29, 2016, the Government filed a two-page notice agreeing that the Mov-ant’s sentence should be vacated. (D.E. 8.) Judge White entered a Report recommending that the Court vacate Movant’s sentence pursuant to Johnson. (D.E. 9 at 3.) The Report relied exclusively on the Government’s concession and did not engage in any substantive analysis. Thereafter, Movant and the Government filed a Joint Stipulation that Defendant should be re-sentenced to 120 months—the statutory maximum allowed under 18 U.S.C. § 924(g).6
Because the Report and the parties failed to address the discrete issues raised herein, and given the Court’s duty to determine whether it has jurisdiction over this matter, see In re Morgan, 717 F.3d 1186, 1193 (11th Cir.2013) (“The bar on second or successive motions is jurisdictional, so [courts] must determine whether an application to file a second or successive motion is based on a claim involving ‘a new rule of constitutional law, made retroactive to cases on collateral review by the Supreme Court, that was previously unavailable ... ’ ”), the Court ordered the parties to file supplemental briefs on July 15, 2016. (D.E. 11.) On July 20, 2016, Movant filed his Supplemental Brief which repeated his earlier arguments regarding the retroactivity of Descamps and Mathis. (D.E..15,) Movant’s Supplemental Brief did not address whether his convictions would have qualified under the enumerated or elements clause at the time of sentencing if the Court were to find that Descamps and Mathis are inapplicable to the § 2255(a) and (h) analyses.
*1352On July 27, 2016, the Government filed its Supplement Brief, withdrawing its previous pleadings and opposing Movant’s 2265 Motion. (D.E. 16.) The Government now argues that “Descamps plays no role in the District Court’s determination of whether Movant has met his burden of establishing that he was in fact sentenced under the residual clause, unless Des-camps was precedent at the time of sentencing.” (Id. at 6.) Instead, the Government asserts that district courts must “make an objective assessment of whether there is a reasonable likelihood that the defendant’s ACCA-enhanced sentence necessarily depended on the now-constitutionally-invalid residual clause, which implicates Johnson, or whether the sentence instead was based on the enumerated crimes or elements clauses, which Johnson did not disturb.” (Id. at 9.) Reviewing Mov-ant’s arguments and underlying predicate offenses, the Government now concludes that neither the record nor controlling case law at the time of sentencing demonstrates that Movant was sentenced under the ACCA’s residual clause. (Id. at 10-11.) It urges this Court to dismiss, or alternatively deny, Movant’s 2255 motion.
On August 8, 2016, Movant filed his Reply (D.E. 17) to the Government’s Supplemental Brief. Movant argues that his claim meets § 2255(h)’s requirements because under the Eleventh Circuit’s clear/unclear test, see In re Rogers, 825 F.3d 1335 (11th Cir.2016), it is unclear whether he was sentenced using the ACCA’s residual clause. Movant asserts that because it is unclear whether he was sentenced under the residual clause, Johnson is implicated and “the Court must apply Descamps and current binding precedent to determine whether the predicate offenses would still qualify under” the elements or enumerated clauses. (D.E. 17 at 4.) He contends that Descamps should apply because it merely “clarified” precedent that existed at the time of his sentencing in 2007—namely Taylor v. United States, 495 U.S. 575, 600-01, 110 S.Ct. 2143, 109 L.Ed.2d 607 (1990). (Id. at 6.) Additionally, he argues that when the record is silent on which ACCA clause served as the basis for a defendant’s enhanced sentence, Supreme Court precedent requires that any ambiguity be resolved in his favor. (Id. at 14-15.) Movant also contends that the Eleventh Circuit’s published order in In re Moore, 830 F.3d 1268, 1271-73, 2016 WL 4010433, at *3-4 (11th Cir. July 27, 2016) contains mere dicta and is unpersuasive; and that the Court should adopt the approach suggested by the panel in Chance, 831 F.3d 1335, 1338-42 (11th Cir. 2016). In further support of the approach advocated by the Chance panel, Movant also cites two recent cases from the Eastern District of Washington which held that Descamps applies retroactively in the Johnson context: United States v. Ladwig, 192 F.Supp.3d 1153, 2016 WL 3619640 (E.D.Wash. June 28, 2016) and United States v. Navarro, 2016 WL 1253830 (E.D.Wash. March 10, 2016). And finally Movant asserts that, by adopting Magistrate Judge White’s 2008 Report and Recommendation, King v. United States, 1:08-cv-22820-JAL/White (S.D. Fla. 2008) (D.E. 11), this Court has already decided that Movant was sentenced using the residual clause.7
*1353III. Legal Standards
Pursuant to 28 U.S.C. § 2255, a prisoner in federal custody may move the court which imposed his sentence to vacate, set aside, or correct the' sentence if it was imposed in violation of federal constitutional or statutory law, was imposed without proper jurisdiction, is in excess of the maximum authorized by law, or is otherwise subject to collateral attack. 28 U.S.C. § 2255. However, “[a] second or successive motion must be certified ... by a panel of the appropriate court of appeals to contain” either:
(1) newly discovered evidence that, if proven and viewed in light of the evidence as a whole, would be sufficient to establish by clear and convincing evidence that no reasonable factfinder would have found the movant guilty of the offense; or
(2) a new rule of constitutional law, made retroactive to cases on collateral review by the Supreme Court, that was previously unavailable.
28 U.S.C. § 2255(h). “The court of appeals may authorize the filing of a second or successive application only if it determines that the application makes a prima facie showing that the application satisfies the requirements of this subsection.” 28 U.S.C. § 2244(b)(3)(C).
The Court of Appeals’ determination is limited. See Jordan v. Sec’y, Dep’t of Corrs., 485 F.3d 1351, 1357-58 (11th Cir.2007) (explaining that the court of appeals’ determination that an applicant has made a prima facie showing that the statutory criteria have been met is simply a threshold determination). If the Court of Appeals’ authorizes the applicant to file a second or successive 2255 Motion, “ ‘[t]he district court is to decide the [§ 2255(h)] issue[s] fresh, or in the legal vernacular, de novo.’ ” In re Moss, 703 F.3d 1301, 1303 (11th Cir.2013) (quoting Jordan, 485 F.3d at 1358). Only if the district court concludes that the applicant has established the statutory requirements for filing a second or successive motion will it “proceed to consider the merits of the motion, along with any defenses and arguments the respondent may raise.” Id.
IY. Discussion
For Movant to be entitled under to file a second or successive motion under 28 U.S.C. § 2255(h), he must allege that his motion contains a Johnson issue—specifically, that the Court enhanced his sentence using the ACCA’s now-voided residual clause. As currently pleaded, Movant’s Johnson claim is inextricably intertwined with Descamps and Mathis. Movant’s entire argument rests on application of the law as it exists today. Movant does not argue that the Court actually relied on the residual clause or that the law, as it existed on August 31, 2007, would have precluded the Court from sentencing Movant under the elements or enumerated clauses of the ACCA.
Consequently, this case turns on the question of whether the Supreme Court’s decisions in Descamps, 133 S.Ct. 2276 (2013) and Mathis, — U.S. -, 136 S.Ct. 2243, 195 L.Ed.2d 604 (June 23, 2016), should be applied retroactively or whether Movant is limited to the law as it existed at the time of sentencing.
A. The Road to Descamps and Mathis
Descamps and Mathis are two opinions in a long line of Supreme Court decisions that have developed the framework for how district courts should apply the ACCA’s sentencing enhancement. Dating back to Taylor, 495 U.S. at 575, 110 S.Ct. 2143, and in subsequent decisions including Shepard v. United States, 544 U.S. 13, 125 S.Ct. 1254, 161 L.Ed.2d 205 (2005), the Supreme Court instructed how .a defendant’s prior convictions should be analyzed *1354to determine whether they qualify as predicate offenses under the ACCA.
In Taylor, the Supreme Court first explained how courts should determine what constitutes a violent felony under the enumerated clause of the ACCA. 495 U.S. 575, 110 S.Ct. 2143, 109 L.Ed.2d 607. As a general rule, Taylor adopted the “formal categorical approach” which directs sentencing courts to look generally at the elements of a defendant’s prior convictions and not the “particular facts underlying those convictions.” Id. at 600, 110 S.Ct. 2143. This approach requires the sentencing judge to compare the elements of the defendant’s prior conviction with the elements of the “generic” ACCA crime. Id. at 599, 110 S.Ct. 2143. If the elements of the defendant’s prior offense are broader than those of the generic crime, then the prior conviction cannot count as a predicate offense under the ACCA. However, if the elements of the defendant’s prior offense match (or are narrower) than the elements of the generic offense then that conviction “categorically” qualifies as an ACCA offense.
If the prior offense does not categorically qualify as a predicate offense under the ACCA because the offense of conviction is broader than the generic crime, Taylor explained that the sentencing court may go beyond the elements of the offense and look to whether “the charging paper and jury instructions actually required the jury to find all the elements of generic burglary in order to convict the defendant.” 495 U.S. at 602, 110 S.Ct. 2143. This later became known as the “modified categorical approach,” which the Supreme Court expanded in Shepard, 544 U.S. at 26, 125 S.Ct. 1254 (2005).
In Shepard, the Supreme Court held that, in addition to the charging papers and jury instructions, sentencing courts could look at “the terms of a plea agreement or transcript of colloquy between judge and defendant in which the factual basis for the plea was confirmed by the defendant, or to some comparable judicial record of this information” when determining whether the defendant had been convicted of a generic offense of the ACCA’s enumerated clause. 544 U.S. at 26, 125 S.Ct. 1254. After this decision, courts routinely utilized “Shepard documents” when deciding whether defendants were convicted of generic offenses or broader offenses that would not qualify under the ACCA. Subsequent decisions of the Eleventh Circuit held that any uncontested facts contained in a defendant’s presentence investigation report are deemed admitted and therefore may be used to determine whether or not a defendant has a prior conviction for a generic offense subject to the ACCA. See, e.g., United States v. Bennett, 472 F.3d 825, 833-34 (11th Cir.2006) (“Bennett failed to object to the facts of his prior convictions as contained in his PSI and addendum to the PSI despite several opportunities to do so; thus, he is deemed to have admitted those facts. ... the district court did not err in relying on the undisputed facts in Bennett’s PSI to determine that his prior convictions were violent felonies under the ACCA and, therefore, that he was an armed career criminal.”).
In 2013, the Supreme Court held that the modified categorical approach is only available when the statute of conviction contains “divisible” elements which require the jury to make a finding in the alternative:
[T]he modified approach merely helps implement the categorical approach when a defendant was convicted of violating a divisible statute. The modified approach thus acts not as an exception, but instead as a tool. It retains the categorical approach’s central feature: a focus on the elements, rather than the facts, of a *1355crime. And it preserves the categorical approach’s basic method: comparing those elements with the generic offense’s. All the modified approach adds is a mechanism for making that comparison when a statute lists multiple, alternative elements, and so effectively creates several different ,.. crimes.
Descamps, 133 S.Ct. at 2285. Descamps made clear that the modified categorical approach does not apply to an overbroad statute, but only to a statute that defines the crime alternatively with “one statutory phrase corresponding to the generic crime and another not.” Id. at 2286. This distinction between “divisible” and “non-divisible” statutes is critical when determining whether a defendant’s prior convictions may now qualify under the ACCA.
Recently, in Mathis, the Supreme Court further clarified the applicability of the modified categorical approach.8 136 S.Ct. at 2249. In Mathis, the Court recognized the distinction between “elements” and “means.” 136 S.Ct. at 2249 (“This case concerns a different kind of alternatively phrased law: not one that lists multiple elements disjunctively, but instead one that enumerates various factual means of committing a single element.”). Mathis clarified that the modified categorical approach does not apply when the statute lists “diverse means of satisfying a single element of a single crime—or otherwise said, spells out various factual ways of committing some component of the offense.” Id. at 2249.
Here, Movant argues that under Des-camps and Mathis, Florida burglary and aggravated battery on a pregnant woman are non-generic and indivisible statutes, and therefore no longer qualify as predicate offenses under the ACCA’s enumerated or element clauses. This of course assumes that Descamps and Mathis apply retroactively, because before these decisions, the law did not draw a distinction between divisible and indivisible statutes or elements and means. Before addressing whether these decisions have retroactive effect, the Court will put the issue in historical perspective and examine the principles of collateral relief.
B. Collateral Proceedings & General Principles of Retroactivity
“Historically, post-conviction challenges to federal convictions were properly brought by petition for writ of habeas corpus.” Bridges v. Vasquez, 151 F.Supp.2d 1353, 1357 (N.D.Fla.2001). “Congress changed this approach dramatically with the adoption in 1948 of 28 U.S.C. § 2255.” Id. (citing United States v. Hayman, 342 U.S. 205, 72 S.Ct. 263, 96 L.Ed. 232 (1952)). In 1996, Congress further restricted the ability of federal prisoners to obtain collateral review by amending § 2255 to limit the circumstances under which second or successive motions can be filed. Id. In passing the Anti-Terrorism and Effective Death Penalty Act of 1996 (“AED-PA”), Congress expressed its intent that, absent limited circumstances, criminal convictions should remain final. See Day v. McDonough, 547 U.S. 198, 208, 126 S.Ct. 1675, 164 L.Ed.2d 376 (2006) (“The considerations of comity, finality, and the expeditious handling of habeas proceedings ... motivated AEDPA _”); Williams v. Taylor, 529 U.S. 420, 421, 120 S.Ct. 1479, 146 L.Ed.2d 435 (2000) (“AEDPA’s purpose [is] to further comity, finality, and *1356federalism principles.”)- Congress decided that federal prisoners should be granted a direct appeal and a first § 2255 motion (if the motion is filed within one year of the conviction becoming final); but that a second or successive motion may be filed only if a panel of a Court of Appeals determines the motion is based on:
(1) newly discovered evidence that, if proven and viewed in light of the evidence as a whole, would be sufficient to establish by clear and convincing evidence that no reasonable fact-finder would have found the movant guilty of the offense; or
(2) a new rule of constitutional law, made retroactive to cases on collateral review by the Supreme Court, that was previously unavailable.
28 U.S.C. § 2255(h).
AEDPA codified principles of finality that have long been a part of the American legal tradition:
Habeas corpus always has been a collateral remedy, providing an avenue for upsetting judgments that have become otherwise final. It is not designed as a substitute for direct review. The interest in leaving concluded litigation in a state of repose, that is, reducing the controversy to a final judgment not subject to further judicial revision, may quite legitimately be found by those responsible for defining the scope of the writ to outweigh in some, many, or most instances the competing interest in re-adjudicating convictions according to all legal standards in effect when a habeas petition is filed. Indeed, this interest in finality might well lead to a decision to exclude completely certain legal issues, whether or not properly determined under the law prevailing at the time of trial, from the cognizance of courts administering this collateral remedy.
[[Image here]]
If law, criminal or otherwise, is worth having and enforcing, it must at some time provide a definitive answer to the question litigants present or else it never provides an answer at all. ... No one, not criminal defendants, not the judicial system, not society as a whole is benefited by a judgment providing a man shall tentatively go to jail today, but tomorrow and every day thereafter his continued incarceration shall be subject to fresh litigation on issues already resolved.
[[Image here]]
[Wjhile the case for continually inquiring into the current constitutional validity of criminal convictions on collateral attack is not an insubstantial one, it is by no means overwhelming. Most interests such a doctrine would serve will be adequately protected by the current rule that all constitutional errors not waived or harmless are cor-rectible on habeas and by defining such errors according to the law in effect when a conviction became final. Those interests not served by this intermediate position are, in my view, largely overridden by the interests in finality.
Mackey v. United States, 401 U.S. 667, 682-83, 690-92, 91 S.Ct. 1160, 28 L.Ed.2d 404 (1971) (Harlan, J., concurring).9 Justice O’Connor, quoting Justice Harlan with approval, stated that “given the ‘broad scope of constitutional issues cognizable on habe-as [it is] sounder, in adjudicating habeas petitions, generally to apply the law pre*1357vailing at the time a conviction became final than it is to seek to dispose of [habe-as] cases on the basis of intervening changes in constitutional interpretation.’” Teague v. Lane, 489 U.S. 288, 306, 109 S.Ct. 1060, 103 L.Ed.2d 334 (1989); see also Solem v. Stumes, 465 U.S. 638, 653, 104 S.Ct. 1338, 79 L.Ed.2d 579 (1984) (Powell, J., concurring in judgment) (“Review on habeas to determine that the conviction rests upon correct application of the law in effect at the time of the conviction is all that is required to ‘forc[e] trial and appellate courts ... to toe the constitutional mark’ ”). In Teague, a plurality of the Court “laid out the framework to be used in determining whether a rule announced in one of [the Supreme Court’s] opinions should be applied retroactively to judgments in criminal eases that are already final.” Mays v. United States, 817 F.3d 728, 734 (11th Cir.2016) (quoting Whorton v. Bockting, 549 U.S. 406, 416, 127 S.Ct. 1173, 167 L.Ed.2d 1 (2007)).
Teague and its progeny created a distinction between an old rule and a new rule. A new rule is defined as “a rule that ... was not ‘dictated by precedent existing at the time the defendant’s conviction became final.’ ” Whorton, 549 U.S. 406, 416, 127 S.Ct. 1173, 167 L.Ed.2d 1 (quoting Saffle v. Parks, 494 U.S. 484, 488, 110 S.Ct. 1257, 108 L.Ed.2d 415 (1990)). In contrast, an old rule clarifies precedent that existed at the time of conviction or sentencing. Whorton, 549 U.S. 406, 416, 127 S.Ct. 1173, 167 L.Ed.2d 1; Mays, 817 F.3d at 734. Writing for a plurality in Teague, Justice O’Connor concluded that new rules only apply retroactively in collateral proceedings in two limited circumstances: (1) the new rule is substantive10 or (2) the new rule is a ‘“watershed rul[e] of criminal procedure’ implicating the fundamental fairness and accuracy of the criminal proceeding.” Saffle v. Parks, 494 U.S. 484, 495, 110 S.Ct. 1257, 108 L.Ed.2d 415 (1990) (citing Teague, 489 U.S. at 288, 109 S.Ct. 1060). In contrast, an old rule applies on both direct and collateral review. Whorton, 549 U.S. at 416, 127 S.Ct. 1173 (citing Griffith v. Kentucky, 479 U.S. 314, 107 S.Ct. 708, 93 L.Ed.2d 649 (1987)).
Between 1990 and 1996, the Teague framework applied to all collateral proceedings. However in 1996, Congress created narrower, more limited parameters for filing a second or successive 2255 motion. As discussed, supra, § 2255(h) requires a panel of the Court of Appeals to certify that the motion involves: (1) newly discovered evidence that would establish that no reasonable fact-finder would have found the movant guilty of the offense, or (2) a new rule of constitutional law made retroactive by the Supreme Court. These are the only two ways a federal court obtains jurisdiction to consider whether or not to disturb the finality of a criminal judgment challenged by a second or successive 2255 motion.
C. Retroactivity of Descamps and Mathis
It is well-established that Des-camps—and by extension Mathis—are old rules which apply on direct and collateral review. Mays, 817 F.3d at 734. Citing Mays, Movant argues that he is entitled to the benefit of the rules announced in Des-camps and Mathis. However, this argument wholly ignores the distinction Congress made between a first § 2255 motion and a second or successive § 2255 motion. Under AEDPA the basis for a second or successive 2255 motion is governed exclu*1358sively by statute. See 28 U.S.C §§ 2244(b)11 and 2255(h); see also Gonzalez v. United States, No. CIV. 15-2080 DRD, 2015 WL 1580676, at *2 (D.N.J. Apr. 2, 2015) (citing United States v. Miller, 197 F.3d 644, 649 (3d Cir.1999) (“Congress enacted the Anti-Terrorism and Effective Death Penalty Act (AEDPA), which severely limits a district court’s jurisdiction over second or successive § 2255 motions.”). AEDPA compels the conclusion that Descamps and Mathis are not retroactive for the purposes of a second or successive 2255 because they are not new rules of constitutional law made retroactive by the Supreme Court.12
Furthermore, the Eleventh Circuit and several other Circuits have considered the retroactivity of Descamps and concluded that it is non-retroactive for the purposes of a second or successive 2255 motion.13 See In re Hires, 825 F.3d 1297, 1302-04 (11th Cir.2016) (Descamps is “not retroactive for purposes of a second or successive § 2255 motion.”); In re Griffin, 823 F.3d 1350, 1355 (11th Cir.2016) (same); In re Thomas, 823 F.3d 1345, 1349 (11th Cir. 2016) (same); see also Ezell v. United States, 778 F.3d 762, 763 (9th Cir.2015) (holding that Descamps is not a new rule of constitutional law made retroactive by the Supreme Court and therefore it may not serve as the basis of a second or successive 2255 motion); In re Jackson, 776 F.3d 292, 296 (5th Cir.2015) (holding that the Supreme Court has not made Des-camps retroactive and that Descamps cannot serve as the basis of a second or successive § 2255 motion). In Hires, the Eleventh Circuit further clarified that, “what matters [ ] is whether, at sentencing, [the Defendant’s] prior convictions qualified pursuant to the residual clause, which would render his sentence subject to successive § 2255 challenge under Johnson, or pursuant to the elements clause, which would not.” 825 F.3d at 1303; see also In re Moore, 830 F.3d at 1271, 2016 WL 4010433, at *2 (“Whether at the time of his September 2005 sentencing hearing any of Moore’s other felony convictions qualified as violent felonies within the statutory meaning is a matter we leave to the district court in the first instance.”) (emphasis added). The Hires panel also stated that Descamps cannot be used to “re-litigate whether a prior [predicate offense]” qualifies under the elements or enumerated clauses and that a movant’s sentence could be affirmed even if the predicate offenses “would [not] count were [the defendant] being sentenced today.” Id.
Additionally, the Eleventh Circuit has granted 2255(h) applications authorizing *1359second or successive motions in Johnson cases where, as here, the sentencing judge made no explicit findings as to the ACCA, see, e.g., In re Jackson, 826 F.3d 1343, 1345-46, 2016 WL 3457659, at *1 (11th Cir. June 24, 2016); In re Adams, 825 F.3d 1283, 1285-86 (11th Cir.2016); and presumably would grant 2255(h) applications in cases where the sentencing court explicitly relied on the residual clause, see In re Chance, 831 F.3d 1335, 1340, 2016 WL 4123844, at *4 (11th Cir. Aug. 2, 2016) (noting that 2255 relief would be granted in “the rare instances where the sentencing judge thought to make clear that she relied on the residual clause.”). However, the Eleventh Circuit has denied applications where the sentencing judge explicitly relied on the enumerated or elements clause. See, e.g., Thomas, 823 F.3d at 1349; see also United States v. Evans, No. 03-0120-WS, 2016 WL 3211428, at *2 (S.D.Ala. June 9, 2016) (noting that the Eleventh Circuit denied 2255(h) applications where the district judge explicitly relied on the enumerated or elements clauses of the ACCA at the time of sentencing). These decisions support the conclusion that Descamps and Mathis should not be applied retroactively to determine whether a movant has been sentenced under the residual clause.
Based on the law of the Eleventh Circuit, the longstanding jurisprudence regarding the importance of the finality of criminal judgments and the clear legislative directive set forth by Congress in 2255(h), the Court finds that Descamps and Mathis should not be applied in this case. Other than the new rule made retroactive by the Supreme Court (i.e. Johnson), the Court must apply the law as it existed at the time of sentencing to determine whether the Movant’s sentence was enhanced under the ACCA’s residual clause.14 See Ziglar v. United States, No. *13602:16-CV-463-WKW, 201 F.Supp.3d 1315, 1323-24, 2016 WL 4257773, at *7 (M.D.Ala. Aug. 11, 2016) (holding Descamps does not apply retroactively to Johnson claims and a movant’s 2255 motion must be dismissed/denied unless he meets his burden that the sentencing judge relied on the residual clause based on the law at the time of sentencing).
D. § 2255(h) Gatekeeping Function
As the Eleventh Circuit has noted, this Court must determine, as an initial matter, whether the § 2255(h) applicant “was sentenced under the residual clause [at the time of sentencing], whether the new rule in Johnson is implicated as the [applicant’s] third predicate conviction, and whether the [] ‘applicant has established the [§ 2255(h)] statutory requirements for filing a second or successive motion.’ ” In re Moore, 830 F.3d at 1271-72, 2016 WL 4010433, at *3.15 Here, the only argument the Applicant advances is that he was sentenced under the residual clause if Des-camps applies retroactively. Because it does not, the Applicant has failed to demonstrate that he was “sentenced under the residual clause.” Accordingly, his § 2255(h) application to file a second or successive motion must be dismissed for lack of jurisdiction.
V. Conclusion
The Court finds that the intent of Congress in passing AEDPA combined with a faithful application of § 2255(h) and over half a century of legal precedent that has espoused the importance of the finality of criminal judgments supports the conclusion that Descamps and Mathis do not apply retroactively to second or successive § 2255 motions. Because Descamps may not be applied retroactively to establish a pure Johnson claim, Movant has failed to demonstrate entitlement to relief. However, the Court will permit the Movant to amend his 2255 motion to show that the sentencing record or controlling law (as it existed at the time of sentencing) establishes that he was sentenced under the residual clause in violation of Johnson.
Therefore, having conducted a review of Movant’s § 2255 Motion, and the record, it is ORDERED AND ADJUDGED that:
1. The Court declines to adopt the Magistrate Judge’s Report and Recommendation (D.E. 9), filed on June 30, 2016, which has been rendered moot by subsequent developments in this case;
2. Movant’s Motion to Vacate (D.E. 5), filed on June 24, 2016, is DIS*1361MISSED WITHOUT PREJUDICE for lack of jurisdiction;
3. Movant shall have fourteen (14) days from the date of this Order to file an Amended 2255 Motion which states a Johnson claim;16
4. If Movant files an amended 2255 motion, the Government shall have ten (10) days to respond and Movant shall have seven (7) days to reply; and
5. If Movant chooses not to file an amended 2255 motion, he may file a motion requesting entry of a final order of dismissal.
DONE AND ORDERED in Chambers at Miami, Florida this 24th day of August, 2016.
.18 U.S.C. 924(e)(1) provides:
In the case of a person who violates section 922(g) of this title and has three previous convictions by any court referred to in section 922(g)(1) of this title for a violent felony or a serious drug offense, or both, committed on occasions different from one another, such person shall be fined under this title and imprisoned not less than fifteen years, and, notwithstanding any other provision of law, the court shall not suspend the sentence of, or grant a probationary sentence to, such person with respect to the conviction under section 922(g).
(Emphasis added.)
.At the time of sentencing, Movant had the . following prior convictions:
1. Trespassing (9/15/93);
2. Aggravated Battery on a Pregnant Victim (6/27/96);
3. Battery (1/6/97);
4. Grand Theft (12/26/97);
*13505. Burglary of an Unoccupied Structure (12/26/97);
6. Possession of Marijuana (2/20/01);
7. Possession of Marijuana (3/14/01);
8. Possession with Intent to Distribute Cocaine (4/12/02);
9. Possession with Intent to Distribute Cocaine (4/12/02);
10. Possession of a Controlled Substance (4/12/02);
11. Grand Theft in the Third Degree (4/12/02);
12. Driving without a License (5/3/06).
.At the sentencing hearing, the Court confirmed there were no objections:
Court: Mr. King, have you read the advisory presentence investigation report?
Defendant: Yes, ma’am.
Court: And have you and your attorney discussed the advisory presentence investigation report?
Defendant: Yes, ma’am.
Court: My examination of the file indicates that neither the Government nor the Defendant have filed any objections to the advisory presentence investigation report. Is that correct?
Counsel for Government: That is correct, your Honor.
Counsel for Defendant: That is correct, your Honor.
Court: The Court will therefore adopt the factual findings and ... guideline applications as contained in the advisory presen-tence investigation report as modified at this hearing.
United States v. King, 07-20253-Cr-Lenard (Tr. Sentencing H’rg (D.E. 30) at 2-3, 5).
. Just months before Movant's sentencing, the Eleventh Circuit held that, under the modified categorical approach, a district court can rely on the facts set forth in the PSI if they are undisputed and thereby deemed admitted. See United States v. Bennett, 472 F.3d 825, 832-34 (11th Cir.2006); see also United States v. Adams, 91 F.3d 114, 116 (11th Cir.1996).
. Specifically, Judge White found that Movant had two prior convictions for serious drug offenses and two prior convictions for violent felonies'—one for aggravated battery and one for grand theft.
. Movant has currently served 111 months of his 180 month sentence.
. Movant’s selective quoting of Judge White’s Report and Recommendation is misleading at best. A full review of Judge White's 2008 Report, which this Court adopted, reveals that Judge White concluded that Movant's conviction for grand theft—and that conviction only—fell under the residual clause. Judge White's Report went on to find that Movant had previously been convicted of two serious drug crimes—which both counted under the ACCA—and that Movant’s conviction for aggravated battery was a violent felony under the ACCA. The Report did not address the conviction for burglary.
. In Mathis, the Court held that Iowa's burglary statute was indivisible because it criminalized the unlawful entry of “any building, structure, or land, water or air vehicle.” Id. at 2250. The Court noted that “those listed locations are not alternative elements, going toward the creation of separate crimes. To the contrary, they lay out alternative ways of satisfying a single locational element.” Id.
. Justice Harlan's concurrence is cited separately at [Williams v. United States], 401 U.S. 667, 91 S.Ct. 1171, 28 L.Ed.2d 404 [(1971)].
. A substantive new rule “includes decisions that narrow the scope of a criminal statute by interpreting its terms, as well as constitutional determinations that place particular conduct or persons covered by the statute beyond the State’s power to punish.” Schriro v. Summerlin, 542 U.S. 348, 352-53, 124 S.Ct. 2519, 159 L.Ed.2d 442 (2004).
. Section 2244(b)'s formal requirements for filing a second or successive habeas motion mirror § 2255(h)'s requirements.
. Movants filing their first 2255 motion are entitled to the retroactive application of Descamps. See, e.g., In re Griffin, 823 F.3d 1350, 1356 (11th Cir.2016).
. Because Mathis is merely an extension of Descamps, it is also an old rule. The Supreme Court made plain in Mathis that it too was merely a clarification of the Court’s ACCA precedent—including Taylor and Descamps:
Our precedents make this a straightforward case. For more than 25 years, we have repeatedly made clear that application of ACCA involves, and involves only, comparing elements. Courts must ask whether the crime of conviction is the same as, or narrower than, the relevant generic offense. They may not ask whether the defendant's conduct—his particular means of committing the crime—falls within the generic definition. And that rule does not change when a statute happens to list possible alternative means of commission: Whether or not made explicit, they remain what they ever were—-just the facts, which ACCA (so we have held, over and over) does not care about.
Mathis, 136 S.Ct. at 2257. Therefore, Mathis, like Descamps, is not retroactive for the purposes of a second or successive 2255 motion.
. Movant cites Ladwig, 192 F.Supp.3d at 1157-58, 2016 WL 3619640, at *2, in support of his argument that Descamps and Mathis apply retroactively to Johnson claims. Ladwig cites Lockhart v. Fretwell, 506 U.S. 364, 371— 72, 113 S.Ct. 838, 122 L.Ed.2d 180 (1993), for the proposition that: "there is existing precedent for applying current case law when determining whether a constitutional error was harmless in the context of a motion under 28 U.S.C. § 2255.” Ladwig, 192 F.Supp.3d at 1160, 2016 WL 3619640, at *5. However, Lockhart does not support Ladwig's broad-sweeping conclusion. Lockhart was decided on a state prisoner’s first § 2254 motion—not a second or successive § 2255 motion—and it did not involve the retroactive application of a new or old rule of law announced by the Supreme Court. 506 U.S. at 364, 113 S.Ct. 838. These distinctions alone show that the Ladwig court overstated Lockhart's significance in resolving the question at hand: whether Descamps and Mathis apply retroactively to a second or successive 2255 motion. The Ladwig court broadened Lockhart's narrow holding to reach its conclusion.
The Lockhart Court reaffirmed that the performance prong of Strickland should be analyzed using the law as it existed at the time the alleged deficiency occurred. Lockhart, 506 U.S. at 371, 113 S.Ct. 838. The Court then considered how lower courts should approach Strickland's prejudice prong. In Lock-hart, the movant argued that he was prejudiced because his attorney failed to argue, that his death sentence was unconstitutional because it was based on an aggravating factor that duplicated an element of the underlying felony. This rule of law was established by the Eighth Circuit in Collins v. Lockhart, 754 F.2d 258, 261 (8th Cir.1985) and governed courts in the Eighth Circuit when Lockhart was sentenced. However, Collins was subsequently overruled which forced the lower courts to determine whether to rely on Collins when ruling on Lockhart’s § 2254 motion. On appeal, the Supreme Court held that a mov-ant cannot satisfy Strickland’s prejudice prong based on an argument that is "wholly meritless under current governing law, even if the [Movant's] objection might have been considered meritorious at the time of its omission.” Lockhart, 506 U.S. at 374, 113 S.Ct. 838 (O'Connor, J., concurring). Chief Justice Rehnquist, writing for the majority, summarized the Court’s holding with this Latin phrase: "Cessante ratione legis, cessat et ipsa *1360lex" (translated as: The reason for a law ceasing, the law itself ceases) and noted that its decision was in harmony with the Teague framework and the well-established principle that the finality of criminal judgments should be preserved except in extraordinary circumstances. Id at 373, 113 S.Ct. 838. Therefore, Lockhart does not support the general proposition that habeas motions should be judged based on the law at the time the motion is considered.
This Court does not find the reasoning in Ladwig to be persuasive—particularly because the decision disregards the statutory limits placed on federal courts by Congress in § 2255(h).)
. Movant has shown that the Court relied upon the residual clause to classify his grand theft conviction as an ACCA predicate. See King v. United States, 1:08-cv-22820-JAL/ White (S.D. Fla. 2008) (D.E. 11 and 18). However, this showing alone is insufficient to unlock 2255(h). Movant must allege that his third predicate offense was under the residual clause. Movant has conceded that he has at least one serious drug offense that qualifies as an ACCA predicate. He has also not alleged that his aggravated battery or burglary convictions are residual clause offenses without the benefit of Descamps and Mathis. Additionally, it should be noted that Movant’s initial 2255 proceeding appears to have counted two prior drug convictions as predicate offenses. See 08-22820-CV-Lenard, D.E. 11 and 18.
. See Mederos v. United States, 218 F.3d 1252 (11th Cir.2000) (permitting amended 2255 motion to relate back to date of original filing). Alternatively, if Movant’s amended 2255 motion may not relate back to the original filing, the Court conditions the dismissal of Movant’s original Motion on his ability to file an amended pleading nunc pro tunc.