including assault with a semi-automatic firearm