The Supreme Court remanded this case for us to reconsider our previous opinion, State v. Johnson (A71708), 117 Or App 529, 844 P2d 935 (1992), in the light of Oregon Laws 1993, chapter 692, section 2, which amended ORS 138.222(5). We remand the entire case for resentencing. State v. Dvorak, 124 Or App 578, 863 P2d 1314 (1993).

Convictions affirmed; remanded for resentencing.