The Court of Appeal agreed with appellant’s argument that Penal Code section 654 barred separate punishment for his false imprisonment conviction and one of his domestic violence convictions. Because section 654 now gives the trial court discretion to choose which term to impose, the court vacated the sentence and remanded for a full resentencing.