BISMARCK, N.D. (AP) — North Dakota's Senate has endorsed sweeping pro-gun legislation that expands the places where a concealed-carry permit holder can pack a gun, including public parks, political rallies and rest areas.

Senators voted 45-2 on Tuesday to approve the legislation. The bill was generated in the House but the Senate added several amendments to it. It now goes back to the House for consideration.

The measure also allows hunters to use legally owned short-barreled rifles for hunting. The bill also allows concealed-carry permit holders to have a gun in liquor stores.

The bill also allows people to carry a single-shot stun gun without having to obtain a concealed-carry permit.