and assault with a deadly weapon but not a firearm