battery and assault with a deadly weapon