OLYMPIA (AP) — Lawmakers in the state House on Wednesday passed a bill raising the smoking and vaping age to 21.

The measure now heads to the Senate for consideration.

The bill targets both tobacco products and so-called “vape” products, including e-cigarettes.

If signed into law the bill would make Washington the seventh state to do so, including California, Oregon and Hawaii. In fact, earlier this month a Democratic lawmaker in Hawaii proposed legislation aimed at making the state the first in the country to ban the sale of cigarettes for everyone except people age 100 and over.

The measure broadly mirrors versions introduced the past three years. None cleared both chambers of the state Legislature.