CODRINGTON J.
*612*810I
INTRODUCTION
Defendant and appellant, Anthony Esparza Cortez, Jr., a convicted felon, and his friend, Michael Saavedra, conspired to commit murder against Rene Perez, and his son-in-law, Alvino Barrera. While defendant drove, Saavedra fired a gun at Perez and Barrera in another car. Defendant and Saavedra then drove to the home of Guadalupe Valle, Perez's relative by marriage. Armed with a rifle and a handgun, defendant and Saavedra fired more than 30 bullets into the house, which was occupied by 10 people. Defendant admitted having possession of the rifle used in the shooting, and of an assault rifle which is banned in California, as well as several rounds of ammunition.
A jury convicted defendant of five charges: conspiracy to commit murder; being a felon in possession of a firearm; possessing firearms ammunition while prohibited from possessing a firearm; assault with a firearm; and possessing an assault weapon. ( Pen. Code, §§ 182, 187, 245, subd. (a)(2), 1192.7, subd. (c)(8), 12022, subd. (a)(1), 12022.53, subd. (c), 29800, subd. (a)(1), 30305, subd. (a), 30605, subd. (a).)1 The court sentenced defendant to an aggregate, determinate term of 29 years four months, followed by an indeterminate term of 25 years to life.
On appeal, defendant claims the trial court erred in not instructing the jury sua sponte on conspiracy to commit assault with a firearm and conspiracy to shoot at an inhabited dwelling as lesser included offenses of conspiracy to commit murder as charged. Defendant also claims the trial court erred in *811denying his requested self-defense instruction. Additionally, he asserts substantial evidence did not support the jury's finding that defendant personally and intentionally discharged a firearm in the commission of conspiracy to commit murder.
Finally, defendant asserts four claims of sentencing error, which the People concede. The parties agree the trial court should strike the one-year section 12022, subdivision (a)(1), enhancement as to the assault with a firearm count (count 4). The trial court should also stay under section 654 the one-year section 12022, subdivision (a)(1), enhancement as to the conspiracy count. In addition, under section 654, the trial court should also stay the separate punishment either for count 2 or count 5. Defendant further asserts in supplemental briefing that this court should remand this matter for resentencing on his firearm enhancement ( § 12022.53, subd. (c) ) under recently enacted Senate Bill No. 620 ( (2017-2018 Reg. Sess.) § 2), which amended section 12022.53, subdivision (h). The parties agree in their supplemental briefs that the recent amendment applies in this case retroactively, because the amendment took effect before final judgment.
We accordingly order this matter remanded to the trial court for the purpose *613of permitting the trial court to exercise its discretion as to whether to strike defendant's firearm enhancement, and to make the other corrections to defendant's sentence, as noted above. In all other regards, we affirm the judgment.
II
STATEMENT OF FACTS
In reviewing instructional error, we consider the evidence in the light most favorable to defendant. ( People v. Millbrook (2014) 222 Cal.App.4th 1122, 1137, 166 Cal.Rptr.3d 217.)
A. Prosecution Evidence
Defendant first became friends with Valle at a classic car show. Both men are fans of 1950's automobiles. Perez is married to Valle's wife's cousin. In June 2013, there was a fight among the guests at a party at Perez's house. The combatants included defendant, Saavedra, and Barrera.
Perez and Valle helped break up the fight. Perez and Valle discussed what had happened and agreed there was no ongoing problem. Defendant seemed pleased to leave the party. Perez did not see any punches thrown and he thought the dispute had ended.
*812After the June party, defendant sent several text messages to Valle, asking for photographs from a car show. Eventually, Perez sent defendant the photographs.
B. The Offenses
The basis for the conspiracy to commit murder in count 1 involved two separate shooting episodes-assault with a firearm on Perez's vehicle and the shooting of the Valle residence.
On August 17, 2013, Perez and Barrera were on a liquor run when a car stopped in front of them at an intersection. Perez saw a hand outside the car but did not see anything else because it was dark. As Perez drove away, he heard a loud pop that could have been a gunshot or a car backfiring. Perez did not see any of the car's occupants or whether they threw beer cans out of the car.
At trial, Perez testified he did not remember telling law enforcement about the car and the incident. However, Perez had stated in his police interview that both he and Barrera were in Perez's car at an intersection when a silver 2000 Chevrolet Monte Carlo with 20-inch chrome rims pulled up to their car, and a single shot was fired from the passenger side towards Perez's car. Perez described the passenger as a bald very thin Hispanic man and said that, as the Monte Carlo drove away, both the driver and the passenger tossed out Modelo beer cans.
The parties stipulated that a witness would testify that, at the intersection where the Perez shooting took place, a silver two-door Chevrolet Impala pulled up with two Hispanic men inside. The driver was a heavyset man, with a mustache; the passenger was a thin man, with a mustache and a goatee.2 The passenger, holding a black handgun, yelled that they were from Carson and Fontana. Defendant is from Fontana and Saavedra is from Carson. Defendant was the driver of their car. The parties stipulated that one of the beer cans collected at the scene had Saavedra's fingerprints on it.
C. The Valle Residence Shooting
Later on the evening of August 17, 2013, Valle was at home with his wife and other *614family members. The rooms were illuminated. One of Valle's sons and a grandson were in the living room in the front of the house with the blinds closed. Valle's daughter was taking a shower in a bathroom adjacent to *813a bedroom near the front door. Two of her friends were waiting for her in the room. Valle's daughter heard a loud noise and the sound of breaking glass. Valle estimated 30 shots were fired through the front door and three walls.
Valle's neighbors across the street heard the shots. The father described two Hispanic men, one big and the other "a little bit smaller." The larger man was shooting a rifle. The thinner man may have fired several shots as well. After the shooting stopped, both men got into the car and drove off. The son testified that he only saw a single shooter, next to a white or a beige car with big silver rims. The shooter was a man, age 30 to 35.
Soon after the shooters left, defendant called Valle multiple times to ask him if he was all right. A subsequent police investigation revealed bullet holes in the door and the inside walls of the house, including the living room windows and the bedroom that was closest to the front door. The bullet strike marks were found all the way from the floor to the ceiling. A .40-caliber shell casing was at the scene. No gun or ammunition of that caliber was found during the subsequent search of defendant's and Saavedra's residences.
During police questioning, defendant admitted that he drinks Modelo beer and knows Saavedra, although he had not seen him for a while. He also admitted there were shell casings in his Chevrolet Monte Carlo. Defendant was equivocal about the details of the Perez assault but he knew no one had been killed.
D. The Weapons Charges
The parties stipulated that defendant was prohibited from possessing a firearm due to a prior felony conviction. Defendant admitted that two rifles and ammunition found at his house belonged to him. The officers found firearm ammunition in a bedroom and additional ammunition (nine-millimeter) in the garage. The police found a synthetic polymer stock used to modify a weapon to change its appearance. The police also found a Norinco-320 rifle (an Uzi) in defendant's car. At trial, a prosecution's expert testified that the Norinco-320 rifle meets the definition of an assault weapon banned under the California Assault Weapons Act because it has a pistol grip, and a capacity to accept a detachable magazine and a folding stock. Also, the police found a .223-caliber Ruger Mini-14 rifle in the attic of the house.
E. The Defense
The defense argued defendant was not guilty of conspiracy to commit murder because there was no evidence of a conspiratorial agreement to kill or the intent to kill. Concerning the Perez episode, the defense argued that the *814evidence, at worst, showed a single shot fired with the intent to scare Perez, not to kill anyone in his car. As to the Valle shooting, the defense argued that Saavedra returned fire only after someone had shot at them from the direction of the Valle house.
Defendant testified that he denied conspiring to kill anyone or intending to kill anyone.3 On August 17, 2013, defendant finished work and headed home, stopping to buy six 24-ounce Modelo beer cans. Defendant then left his home, planning to attend a children's birthday party at Saavedra's house, so he also bought a gift card and another 36 cans of Modelo beer.
*615Defendant arrived at around 6:00 or 6:30 p.m. Defendant had placed weapons in the car-handguns and a Ruger Mini-14 rifle-because the next morning, he planned to go to a shooting range in Fontana.
After drinking heavily, defendant, Saavedra, and another man made a beer run. Defendant bought another 30-pack of Modelo beer while Saavedra bought a 30-pack of Bud Light. They returned to the party and played darts. Defendant had three or four shots of tequila; Saavedra drank more because he was losing the darts competition.
After Saavedra and his wife had an argument, she asked everyone to leave. Defendant left the party with Saavedra and again stopped by a liquor store. Saavedra stayed in the car while defendant bought beer. Defendant encountered Barrera, with whom he had the fight in June. Defendant thought the fight was no longer an issue, but Barrera kept repeating, "Hey, bitch. Remember me?" Barrera then threw a beer bottle at defendant but missed.
Defendant drove his car to Perez's house. Defendant wanted to ask Perez about the argument with Barrera. When Perez did not answer, defendant kicked over a motorcycle in anger. Defendant then drove back to the same liquor store and bought a 30-pack of Modelo beers and an 18-pack of Bud Light. At that point, defendant already had 15 to 18 beers.
As they were driving, defendant and Saavedra saw Barrera driving Perez's car in the opposite direction. Without any notice, Saavedra fired a single shot. Afterwards, Saavedra told defendant that he did not intend to shoot anyone. Barrera drove off in a different direction. Defendant and Saavedra did not pursue him.
F. The Valle Residence Shooting
Defendant and Saavedra noticed police activity and decided to go to Valle's house to evade the police and hide the guns. Defendant drove to the *815Valle house and parked, blocking the driveway at an angle. Defendant got out of the car and grabbed as much beer as he could. Saavedra took his handgun and rifle. Defendant noticed two men by the garage door, wearing black sweaters with hoods, concealing their faces. One man started to shoot. Saavedra dove and returned fire. They continued to exchange fire until defendant threw a beer can at the shooter, who ran into the house, firing rounds as he moved towards the entrance.
After the shooting finished, defendant and Saavedra slowly drove off. Defendant was nervous and fumbling with his keys. Saavedra had been scorched by a round that came very close to him. Defendant checked to see if Saavedra was all right. Defendant called Valle and asked why he was shooting at him. Valle said that he could not really talk and that he would call him back later.
III
INSTRUCTION ON CONSPIRACY TO COMMIT ASSAULT WITH A FIREARM OR TO SHOOT AT AN INHABITED DWELLING
Defendant argues the trial court had a sua sponte duty to instruct the jury on two offenses that he argues were necessarily included within the charged offense of conspiracy to commit murder: conspiracy to commit assault with a firearm and conspiracy to shoot at an inhabited dwelling. However, neither offense was necessarily included within conspiracy to commit murder as charged. The alleged conspiracy agreement was only to commit murder. There are no allegations defendant conspired or agreed to commit an assault with a firearm or shoot at an inhabited dwelling.
*616Such conspiracy offenses thus are not necessarily included offenses.
In addition, substantial evidence did not support giving either instruction. At trial, defendant contended he did not commit any offense. He also did not claim he conspired to commit any lesser offense. Based on the evidence that defendant and Saavedra fired more than 30 bullets into an occupied residence, it was not reasonable for a jury to find that defendant conspired to commit an assault with a firearm or conspired to shoot at an inhabited house, instead of finding defendant conspired to commit murder.
Finally, any error was harmless because there was overwhelming evidence defendant conspired to commit murder when he and Saavedra both simultaneously fired a deluge of bullets into Valle's home.
*816A. Procedural Background
Count 1 of the charging document alleged that defendant conspired to commit murder in violation of section 187 based on 10 overt acts: (1) defendant and Saavedra armed themselves; (2) defendant drove his car; (3) defendant pulled his car in front of a car driven by Perez; (4) Saavedra fired one shot at Perez's vehicle; (5) defendant then drove to the Valle residence; (6) defendant and Saavedra exited the car and approached the Valle residence; (7) and (8) both men fired their weapons-about 30 bullets-at the house; (9) defendant and Saavedra then fled the scene; and (10) defendant hid the .223-caliber rifle used in the shooting in his home's attic.
The court instructed the jurors that to find defendant guilty of conspiracy to commit murder as charged, they had to find that defendant and Saavedra agreed intentionally and unlawfully to kill and committed at least one of the overt acts alleged. The court further instructed the jury that the "People have presented evidence of more than one event to prove that the defendant committed this offense [of conspiracy to murder], specifically evidence of the alleged shooting of Rene Perez and evidence of an alleged shooting at [Valle's] residence." The overt acts could apply either to conspiracy to commit murder of Perez or murder at the Valle residence. The jury was also instructed that, in determining whether defendant committed the alleged overt acts, it was to consider "all of the evidence presented about the overt acts." Finally, in finding defendant guilty of conspiracy to commit murder as charged, the jury found that, in committing that offense, defendant personally and intentionally discharged a firearm and that he participated as a principal in committing that offense, knowing that another principal to the offense was armed with a firearm.
B. Law Applicable to Determining a Lesser Included Offense
The test for determining whether there is a necessarily included offense is whether one offense cannot be committed without necessarily committing another offense; the latter is a necessarily included offense. ( People v. Pendleton (1979) 25 Cal.3d 371, 382, 158 Cal.Rptr. 343, 599 P.2d 649.) "An offense is necessarily included in the charged offense if (1) under the statutory definition of the charged offense the charged offense cannot be committed without committing the lesser offense, or (2) the charging allegations of the accusatory pleading include language describing the offense in such a way that if the charged offense was committed as specified, the lesser offense was necessarily committed." ( People v. Fenenbock (1996) 46 Cal.App.4th 1688, 1707, 54 Cal.Rptr.2d 608 ( Fenenbock ); see also People v. Lopez (1998) 19 Cal.4th 282, 288-289, 79 Cal.Rptr.2d 195, 965 P.2d 713 ;
*617*817People v. Clark (1990) 50 Cal.3d 583, 636, 268 Cal.Rptr. 399, 789 P.2d 127.) These two lesser-included-offense tests are known as the elements test and the accusatory pleading test, respectively. Often, when considering whether to instruct on a lesser included offense (the relationship) courts have applied either the elements test or the accusatory pleading test. ( People v. Juarez (2016) 62 Cal.4th 1164, 1174, 199 Cal.Rptr.3d 735, 366 P.3d 989 ; People v. Shockley (2013) 58 Cal.4th 400, 404, 165 Cal.Rptr.3d 497, 314 P.3d 798.)
Here, the parties agree the assault and dwelling-shooting conspiracy offenses do not qualify as lesser included offenses to the murder conspiracy charge under the elements test. The issue here is whether the offenses qualified as lesser included offenses under the accusatory pleading test by virtue of language in the information describing the overt acts. In determining whether an accusatory pleading encompasses an allegedly lesser included offense, the courts "consider only the pleading for the greater offense." ( People v. Montoya (2004) 33 Cal.4th 1031, 1036, 16 Cal.Rptr.3d 902, 94 P.3d 1098.) It is "of no consequence that the evidence at trial might also establish guilt of another and lesser crime than that charged." ( People v. Steele (2000) 83 Cal.App.4th 212, 218, 99 Cal.Rptr.2d 458.)
California courts have a sua sponte duty to instruct the jury on all necessarily included offenses supported by substantial evidence from which a reasonable juror could find the defendant guilty of the lesser offense but not the greater. ( People v. Licas (2007) 41 Cal.4th 362, 366, 60 Cal.Rptr.3d 31, 159 P.3d 507, citing People v. Cole (2004) 33 Cal.4th 1158, 1218, 17 Cal.Rptr.3d 532, 95 P.3d 811.) This court independently reviews a trial court's failure to instruct the jury on a necessarily included offense. ( Licas , supra , at p. 366, 60 Cal.Rptr.3d 31, 159 P.3d 507.)
C. Conspiracy
Section 182 defines the crime of conspiracy as two or more persons conspiring to "commit any crime." ( § 182, subd. (a)(1).) Section 184 requires that one or more parties to the agreement commit an act to "effect the object" of the conspiracy. (§ 184.) Thus a conspiracy requires proof that the defendant and at least one other person "had the specific intent to agree or conspire to commit an offense, as well as the specific intent to commit the elements of that offense, together with proof of the commission of an overt act 'by one or more of the parties to such agreement' in furtherance of the conspiracy." ( People v. Morante (1999) 20 Cal.4th 403, 416, 84 Cal.Rptr.2d 665, 975 P.2d 1071, quoting § 184; People v. Cortez (1998) 18 Cal.4th 1223, 1232, 77 Cal.Rptr.2d 733, 960 P.2d 537.) An overt act is an " ' "outward act done in pursuance of the crime and in manifestation of an intent or design, looking toward the accomplishment of the crime." ' " ( *818People v. Johnson (2013) 57 Cal.4th 250, 259, 159 Cal.Rptr.3d 70, 303 P.3d 379, quoting People v. Zamora (1976) 18 Cal.3d 538, 549, fn. 8, 134 Cal.Rptr. 784, 557 P.2d 75.) The overt act requirement "consists of an overt act, not a specific overt act." ( People v. Russo (2001) 25 Cal.4th 1124, 1134, 108 Cal.Rptr.2d 436, 25 P.3d 641.) The jury need not unanimously agree on a particular overt act but only that the defendant or a coconspirator committed at least one of the overt acts alleged. ( Ibid. )
Conspiracy is a crime distinct from the substantive offense that is its object; it does not require commission of the substantive offense (target offense). ( People v. Swain (1996) 12 Cal.4th 593, 600, 49 Cal.Rptr.2d 390, 909 P.2d 994 ;
*618People v. Morante , supra , 20 Cal.4th at pp. 416-417, 84 Cal.Rptr.2d 665, 975 P.2d 1071.) The conspiratorial agreement is itself the essence of the crime, and is what it seeks to punish. ( People v. Johnson , supra , 57 Cal.4th at p. 258, 159 Cal.Rptr.3d 70, 303 P.3d 379, citing Swain , supra , at p. 599, 49 Cal.Rptr.2d 390, 909 P.2d 994.) That is why, "[o]nce one of the conspirators has performed an overt act in furtherance of the agreement, 'the association becomes an active force[;] it is the agreement, not the overt act, which is punishable. Hence the overt act need not amount to a criminal attempt and it need not be criminal in itself.' " ( Johnson , supra , at p. 259, 159 Cal.Rptr.3d 70, 303 P.3d 379.)
D. Application of Fenenbock and Cook
Defendant argues that under People v. Cook (2001) 91 Cal.App.4th 910, 111 Cal.Rptr.2d 204 ( Cook ), the trial court was required to instruct sua sponte on conspiracy to commit assault with a firearm and conspiracy to shoot into an inhabited home, as lesser included offenses of the count 1 charge of conspiracy to murder. The People argue Cook was wrongly decided and this court should follow Fenenbock , supra , 46 Cal.App.4th 1688, 54 Cal.Rptr.2d 608, in which the court held that the trial court was not required to instruct on any lesser conspiracy crimes. As noted by the People, there is a split of authority as to whether the overt acts allegations in the accusatory pleading can be considered when determining whether the court must instruct sua sponte on a lesser included conspiracy offense under the accusatory pleading test. ( Cook , supra , at p. 920, 111 Cal.Rptr.2d 204.)
In Fenenbock , the defendants argued the trial court erred in not sua sponte instructing on conspiracy to commit assault, battery, and mayhem as lesser included offenses of conspiracy to commit murder. At the outset, the parties in Fenenbock agreed that the target offense of assault, battery, and mayhem did not qualify as offenses included within the statutory definition of murder under the elements test. The defendants, however, argued that the offenses qualified as lesser included target offenses under the accusatory pleading test "by virtue of language in the information describing the overt acts." ( Fenenbock , supra , 46 Cal.App.4th at p. 1707, 54 Cal.Rptr.2d 608.) The Fenenbock court disagreed, stating: "Here, in the context of deciding whether the trial court was *819obligated to instruct sua sponte on lesser included offenses, we conclude that allegations of overt acts committed in furtherance of the alleged conspiracy do not provide notice of lesser included target offenses." ( Id. at p. 1708, 54 Cal.Rptr.2d 608.) This is because the criminal act in a conspiracy is the agreement. ( Ibid. )
Fenenbock explained that a conspiracy agreement is not punishable unless an overt act is committed in furtherance of the conspiracy. ( Fenenbock , supra , 46 Cal.App.4th at p. 1708, 54 Cal.Rptr.2d 608 ; §§ 182, subd. (b), 184.) "[D]ue process principles require that overt acts be pleaded with particularity to give the defendant notice of the prosecution's theory." ( Fenenbock , supra , at p. 1708, 54 Cal.Rptr.2d 608.) But "[i]t is the agreement, not the overt act in furtherance of the agreement, which constitutes the offense." ( Id . at p. 1709, 54 Cal.Rptr.2d 608.) The Fenenbock court concluded that, "[b]ecause overt acts need not be criminal offenses or even acts committed by the defendant, the description of the overt acts in the accusatory pleading does not provide notice of lesser offenses necessarily committed by the defendant." ( Ibid. ) Therefore, under Fenenbock , "it is the description of the agreement within the accusatory *619pleading, not the description of the overt acts, which must be examined to determine whether a lesser offense was necessarily the target of the conspiracy." ( Ibid . )
Defendant urges this court to decline to follow Fenenbock , supra , 46 Cal.App.4th 1688, 54 Cal.Rptr.2d 608, and instead follow Cook , supra , 91 Cal.App.4th 910, 111 Cal.Rptr.2d 204. In Cook , the defendants appealed their convictions, which included conspiracy to commit assault with a firearm as a lesser included offense of conspiracy to commit murder. Relying on Fenenbock , the Cook defendants argued that the trial court violated their right to notice and due process by instructing the jury that if they had a reasonable doubt that the defendants were guilty of conspiracy to commit murder, they could convict the defendants of the lesser included offense of conspiracy to commit assault with a firearm. ( Cook , supra , at p. 913, 111 Cal.Rptr.2d 204.)
The Cook court rejected this contention, holding that "the trial court may look to the overt acts pleaded in a charge of conspiracy to determine whether the charged offense includes the lesser included offense. Under the accusatory pleading test for determining lesser included offenses, we find that conspiracy to commit assault by means of a firearm is a lesser included offense of conspiracy to commit murder as that offense was pleaded in the accusatory pleading. The overt acts alleged in the information gave notice to defendants of the lesser included offense, and the defendants do not claim the facts shown at the preliminary hearing failed to give them notice of the lesser offense or that they were surprised by the evidence presented at trial." ( Cook , supra , 91 Cal.App.4th at p. 914, 111 Cal.Rptr.2d 204.)
Cook , supra , 91 Cal.App.4th 910, 111 Cal.Rptr.2d 204 is distinguishable. In Cook , the defendant appealed on the ground the trial court erred in instructing on conspiracy to *820commit assault with a firearm as a lesser included offense of murder, whereas, here, defendant appeals the trial court's failure to instruct sua sponte on any lesser included offenses to conspiracy to commit murder. Unlike in the instant case, the Cook defendants argued their notice and due process rights were violated by the court instructing on the lesser included offense based on the overt acts allegations. Also, in Cook , the People conceded instructional error and requested reversal of the defendants' conspiracy convictions. The Cook court nevertheless upheld the trial court's instruction on the lesser included offense, concluding the accusatory pleading provided sufficient notice of the lesser included offense of conspiracy to commit assault with a firearm. ( Id . at p. 913, 111 Cal.Rptr.2d 204.)
We agree with Cook to the extent that the trial court may consider overt act allegations when determining whether sua sponte instruction on a lesser included conspiracy offense is required. Even though overt acts need not be criminal offenses or acts committed by the defendant, there may be overt act allegations establishing that the defendant has agreed or conspired to commit lesser included target offenses. It is therefore not error for the trial court to consider the overt act allegations when determining whether the conspiracy count allegations as a whole require sua sponte instruction on a lesser included conspiracy offense. The Cook court recognized that, "[t]o the extent an accusatory pleading fails to allege overt acts sufficient to give notice of a lesser included offense, the trial court may not rely on the pleading as a basis to instruct on lesser included offenses not included in the allegations of that pleading. Nevertheless, the possibility that some pleadings *620charging conspiracy may fail to give sufficient notice of lesser included offenses is not cause to hold, as a matter of law, that no pleading charging conspiracy gives sufficient notice of lesser included offenses." ( Cook , supra , 91 Cal.App.4th at p. 921, 111 Cal.Rptr.2d 204.)
We disagree, however, with Cook 's holding that the pleadings, including the overt act allegations, required an instruction on the lesser included offense of conspiracy to commit assault with a firearm. ( Cook , supra , 91 Cal.App.4th at p. 922, 111 Cal.Rptr.2d 204.) In Cook , as in the instant case and in Fenenbock , the accusatory pleading did not allege that the defendants agreed to commit any crime, other than murder. There were no allegations, even in the overt acts allegations, that the defendants agreed to commit merely an assault. The Cook accusatory pleading alleged the four defendant's conspired to commit murder and in doing so, committed the following overt acts: Two of the defendants purchased a gun to carry out the object of the conspiracy, and all four defendants met and discussed killing the two victims. All four defendants then went to the victims' apartment and one of the defendants shot both victims, killing one of them. The other victim survived. ( Cook , supra , at p. 919, fn. 22, 111 Cal.Rptr.2d 204.)
*821Assuming under Cook that the trial court could properly consider the alleged overt acts in determining whether a conspiracy charge encompasses other, lesser target offenses, the overt acts alleged in this case did not render defendant's allegedly lesser offenses necessarily included. The description of the conspiratorial agreement to commit murder cannot be fairly read to describe or encompass either conspiracy to commit assault with a firearm or conspiracy to shoot at an inhabited dwelling. Therefore, the trial court was not required to instruct sua sponte on either of these offenses, because the accusatory pleadings did not place defendant on notice of prosecution of any conspiracy offense, other than conspiracy to commit murder. ( Schmuck v. U.S. (1989) 489 U.S. 705, 717, 109 S.Ct. 1443, 103 L.Ed.2d 734 ; Cook , supra , 91 Cal.App.4th at p. 921, 111 Cal.Rptr.2d 204.) Although the overt acts allegations describe acts that would support charges for assault and shooting at an inhabited dwelling, such allegations are insufficient to support conspiracy charges based on those target offenses, because there are no allegations of the requisite element of defendant agreeing or conspiring to commit those target offenses. Therefore, the trial court did not err in not sua sponte instructing on conspiracy to commit assault or shoot at an inhabited dwelling as lesser included offenses of conspiracy to commit murder.
The fact that defendant was charged with the substantive offense of assault with a firearm for the Perez shooting (count 4) does not mean the conspiracy charge necessarily encompassed that offense as a lesser target offense of conspiracy to commit murder, as defendant argues. Defendant and Saavedra could have agreed at the outset to commit murder and then planned to accomplish the murder by ambushing and shooting at Perez and Barrera. They could have then committed the substantive offense of assault with a firearm when Saavedra shot at Perez and Barrera and missed them. (§ 254, subd. (a)(2).) Their commission of assault with a firearm would not have changed the original nature of their conspiracy, which was to commit murder, and it did not render assault with a firearm a necessarily included target offense of the conspiracy to commit murder.
E. Insufficient Evidence to Support Instruction on Lesser Included Offenses
Even if the accusatory pleading allegations supported instruction on *621the offenses of conspiracy to commit assault and shooting at an inhabited dwelling, there was insufficient evidence to support such instructions. A trial court is not obligated to instruct the jury on a necessarily included offense without substantial evidence or with no evidence that the offense was less than charged. ( People v. Mendez (1999) 19 Cal.4th 1084, 1100-1101, 1106, 81 Cal.Rptr.2d 301, 969 P.2d 146.) Here, there was insufficient evidence that, if there was a conspiracy as alleged, it was for anything other than murder. *822There was evidence that defendant was in a feud with Barrera, Perez's son-in-law. Perez was related by marriage to Valle's wife. On the evening of the shootings, defendant and Saavedra ambushed Perez and Barrera at an intersection near Perez's home, and Saavedra fired a gun at Perez's car. Then, defendant and Saavedra drove to Valle's house and, using a rifle and a handgun, together fired approximately 30 bullets into the house, perforating the walls from floor to ceiling and the house from front to back. No reasonable juror could have found from the foregoing evidence that defendant and Saavedra did not conspire to kill someone but conspired only to assault someone with a firearm or to shoot at the Valle residence (§§ 240, 254, subd. (a)(2) ), or shoot at an inhabited dwelling (§ 246).
Furthermore, defendant did not claim at trial that he committed the two lesser offenses. Rather, defendant testified he did not conspire with Saavedra to commit any offense at all. Instead, Saavedra abruptly fired the handgun at Perez's car without there being any agreement or discussion with defendant. The Valle shooting occurred because someone fired on defendant and Saavedra first. Because substantial evidence was lacking to support an instruction on either allegedly lesser target offense, the trial court was not required to instruct the jury on them.
Defendant's federal constitutional claim also fails because defendant's asserted offenses were not necessarily included within the charged offense of conspiracy or supported by substantial evidence. ( People v. Valentine (2006) 143 Cal.App.4th 1383, 1386-1388, 49 Cal.Rptr.3d 948 [rejecting claim that failure to instruct on an offense not necessarily included within the charged offense violated defendant's right to present a complete defense, as that failure "simply reflected the fact that the prosecutor chose not to file on the other charge."].) Our Supreme Court has also made clear that the failure to instruct on a necessarily included offense in a noncapital case is remediable only under state law, not under federal constitutional law. (See People v. Breverman (1998) 19 Cal.4th 142, 165, 77 Cal.Rptr.2d 870, 960 P.2d 1094 [no federal constitutional right to a necessarily included offense instruction in a noncapital case].)
F. Harmless Error
Finally, if there was any error in not instructing on conspiracy to commit assault with a firearm or conspiracy to shoot at an inhabited dwelling, it was harmless because it was not reasonably probable a more favorable verdict would have occurred but for the error. ( People v. Breverman , supra, 19 Cal.4th at p. 162, 77 Cal.Rptr.2d 870, 960 P.2d 1094, citing People v. Watson (1956) 46 Cal.2d 818, 836, 299 P.2d 243 ; People v. Lasko (2000) 23 Cal.4th 101, 111, 96 Cal.Rptr.2d 441, 999 P.2d 666.) The record establishes that the jury based defendant's conviction for *823conspiracy to commit murder on the Valle shooting, because the jury specifically found that defendant personally and intentionally discharged a firearm in committing that offense.
Also, there was overwhelming evidence supporting defendant's conviction for conspiracy *622to commit murder. Defendant admitted at trial that he and Saavedra were armed when they went to the Valle residence. A witness testified that both people shot at the house and that defendant, the heavier person, was shooting the rifle. The shell casings at the scene had been fired from defendant's rifle. Defendant presented his chosen defense by testifying at trial that he did not conspire to commit any crime and he shot at the Valle residence only in response to being fired upon. Defendant did not request an instruction on either lesser conspiracy offense and instead argued that the evidence raised a reasonable doubt of his guilt of conspiracy as charged or was otherwise insufficient to establish guilt. (See People v. Rogers (2006) 39 Cal.4th 826, 872, 48 Cal.Rptr.3d 1, 141 P.3d 135.)
Since the record demonstrates that the conspiracy conviction was based on the Valle shooting and was supported by substantial evidence, any error in failing to instruct the jury on the allegedly lesser conspiracy offenses was also harmless, because the evidence did not support a finding that defendant committed either lesser conspiracy offense instead of conspiracy to commit murder. No reasonable juror would have found defendant guilty of any conspiracy crime less than conspiracy to commit murder.
IV-VI
VII
DISPOSITION
The judgment of conviction is affirmed. The judgment of sentence is reversed and this matter is remanded to the trial court for resentencing, with instructions to the trial court to (1) strike the one-year section 12022, subdivision (a)(1), enhancement as to the assault with a firearm count (count 4); (2) stay under section 654 the one-year section 12022, subdivision (a)(1), enhancement as to the conspiracy count (count 1); (3) elect under section 654 to stay separate punishment either on count 2 or count 5; and (4) exercise its *824discretion under recently amended section 12022.53, subdivision (h), as to whether to strike defendant's section 12022.53, subdivision (c), firearm enhancement (count 1).6
We concur:
RAMIREZ P.J.
MILLER J.
See footnote *, ante .