Tyra Heman, a senior at Marjory Stoneman Douglas High School, holds a sign that reads, 'Enough No Guns,' in front of the school where 17 people that were killed.
Joe Raedle/Getty Images North America/Getty Images
Tyra Heman, a senior at Marjory Stoneman Douglas High School, holds a sign that reads, 'Enough No Guns,' in front of the school where 17 people that were killed.
Now playing
01:15
School shooting survivors demand change
TINLEY PARK, IL - OCTOBER 18:  Pistols are offered for sale at Freddie Bear Sports on October 18, 2012 in Tinley Park, Illinois.  Facing a $267.5 million fiscal 2013 budget gap, Cook County, which includes the City of Chicago and suburbs, has proposed a tax of 5 cents per bullet and $25 on each firearm sold at gun and sporting goods stores in the county. Fred Lutger, who has owned Freddie Bear Sports for 35 years, is concerned with the impact the tax will have on his store which is located about 2 miles inside the Cook County line.  (Photo by Scott Olson/Getty Images)
Scott Olson/Getty Images North America/Getty Images
TINLEY PARK, IL - OCTOBER 18: Pistols are offered for sale at Freddie Bear Sports on October 18, 2012 in Tinley Park, Illinois. Facing a $267.5 million fiscal 2013 budget gap, Cook County, which includes the City of Chicago and suburbs, has proposed a tax of 5 cents per bullet and $25 on each firearm sold at gun and sporting goods stores in the county. Fred Lutger, who has owned Freddie Bear Sports for 35 years, is concerned with the impact the tax will have on his store which is located about 2 miles inside the Cook County line. (Photo by Scott Olson/Getty Images)
Now playing
00:47
By the numbers: Gun deaths in America
Glendale, UNITED STATES: A man chooses a gun at the Gun Gallery in Glendale, California, 18 April 2007. The massacre at Virginia Tech has ignited fresh talk in the Democratic-led US Congress about tightening US gun laws but it is doubtful enough lawmakers will tackle the politically charged issue. With so many citizens in love with their guns and defensive of their right under the Constitution to keep and bear arms, politicians are reluctant to take on gun owners or the powerful gun lobby.    AFP PHOTO/GABRIEL BOUYS (Photo credit should read GABRIEL BOUYS/AFP/Getty Images)
GABRIEL BOUYS/AFP/AFP/Getty Images
Glendale, UNITED STATES: A man chooses a gun at the Gun Gallery in Glendale, California, 18 April 2007. The massacre at Virginia Tech has ignited fresh talk in the Democratic-led US Congress about tightening US gun laws but it is doubtful enough lawmakers will tackle the politically charged issue. With so many citizens in love with their guns and defensive of their right under the Constitution to keep and bear arms, politicians are reluctant to take on gun owners or the powerful gun lobby. AFP PHOTO/GABRIEL BOUYS (Photo credit should read GABRIEL BOUYS/AFP/Getty Images)
Now playing
02:00
What stops the mentally ill from buying guns?
A row of rifles is seen on display at a National Rifle Association outdoor sports trade show on February 10, 2017 in Harrisburg, Pennsylvania.
The Great American Outdoor Show, a nine day event celebrating hunting, fishing and outdoor traditions, features over 1,000 exhibitors ranging from shooting manufacturers to outfitters to fishing boats and RVs, and archery to art.   / AFP / DOMINICK REUTER        (Photo credit should read DOMINICK REUTER/AFP/Getty Images)
DOMINICK REUTER/AFP/AFP/Getty Images
A row of rifles is seen on display at a National Rifle Association outdoor sports trade show on February 10, 2017 in Harrisburg, Pennsylvania. The Great American Outdoor Show, a nine day event celebrating hunting, fishing and outdoor traditions, features over 1,000 exhibitors ranging from shooting manufacturers to outfitters to fishing boats and RVs, and archery to art. / AFP / DOMINICK REUTER (Photo credit should read DOMINICK REUTER/AFP/Getty Images)
Now playing
01:45
The NRA used to support gun control. Here's why
McKenna Ewen
Now playing
02:15
The messages kids want you to see
Now playing
02:07
They hope you remember what they'll never forget
Carpenter Greg Zanis (C) who drove from Chicago unloads his crosses outside the First Baptist Church which was the scene of the mass shooting that killed 26 people in Sutherland Springs, Texas on November 8, 2017.
A gunman wearing all black armed with an assault rifle opened fire on a small-town Texas church during Sunday morning services, on November 5, killing 26 people and wounding 20 more in the last mass shooting to shock the United States. / AFP PHOTO / MARK RALSTON        (Photo credit should read MARK RALSTON/AFP/Getty Images)
MARK RALSTON/AFP/AFP/Getty Images
Carpenter Greg Zanis (C) who drove from Chicago unloads his crosses outside the First Baptist Church which was the scene of the mass shooting that killed 26 people in Sutherland Springs, Texas on November 8, 2017. A gunman wearing all black armed with an assault rifle opened fire on a small-town Texas church during Sunday morning services, on November 5, killing 26 people and wounding 20 more in the last mass shooting to shock the United States. / AFP PHOTO / MARK RALSTON (Photo credit should read MARK RALSTON/AFP/Getty Images)
Now playing
00:55
Man builds crosses for shooting victims (2017)
President Donald Trump applauds the audience after speaking at the National Rifle Association annual convention in Dallas, Friday, May 4, 2018. (AP Photo/Sue Ogrocki)
Sue Ogrocki/AP
President Donald Trump applauds the audience after speaking at the National Rifle Association annual convention in Dallas, Friday, May 4, 2018. (AP Photo/Sue Ogrocki)
Now playing
02:37
Trump's complex relationship with guns
FILE - In this June 25, 2010, file photo Britain's Prince Harry fires a Colt M4 assault riffle on a United States Military Academy range in West Point, N.Y.  The Defense Department is searching for the successor to the M4 combat rifle and gun makers are loading with lobbyists to win the work. Colt Defense of West Hartford, Conn., had an exclusive deal to provide M4s to the U.S. military and didnt need a hired gun looking out for its interests in Washington. (AP Photo/Chad Rachman, Pool, File)
Chad Rachman/POOL NEW YORK POST/ASSOCIATED PRESS
FILE - In this June 25, 2010, file photo Britain's Prince Harry fires a Colt M4 assault riffle on a United States Military Academy range in West Point, N.Y. The Defense Department is searching for the successor to the M4 combat rifle and gun makers are loading with lobbyists to win the work. Colt Defense of West Hartford, Conn., had an exclusive deal to provide M4s to the U.S. military and didnt need a hired gun looking out for its interests in Washington. (AP Photo/Chad Rachman, Pool, File)
Now playing
01:40
History of the modern assault-style rifle
CNN photo illustration
Now playing
01:58
Flaws in gun background check system cost lives
NS Slug: FL: PUBLIX DIE-IN HELD AGAINST CANDIDATE ADAM PUTNAM  Synopsis: Footage of several Marjory Stoneman Douglas students participating in a protest at a Coral Springs, FL Publix  Video Shows: - Footage of several Marjory Stoneman Douglas students participating in a protest at a Coral Springs, FL Publix by drawing chalk outlines in the parking lot and lied down for exactly 12 minutes in the store. - MSD student David Hogg called for a boycott of Publix due to them donating to gubernatorial candidate Adam Putnam, who has an "A" rating from the NRA.   Keywords: FLORIDA PUBLIX PROTEST NRA GUN SUPPORT
WSVN
NS Slug: FL: PUBLIX DIE-IN HELD AGAINST CANDIDATE ADAM PUTNAM Synopsis: Footage of several Marjory Stoneman Douglas students participating in a protest at a Coral Springs, FL Publix Video Shows: - Footage of several Marjory Stoneman Douglas students participating in a protest at a Coral Springs, FL Publix by drawing chalk outlines in the parking lot and lied down for exactly 12 minutes in the store. - MSD student David Hogg called for a boycott of Publix due to them donating to gubernatorial candidate Adam Putnam, who has an "A" rating from the NRA. Keywords: FLORIDA PUBLIX PROTEST NRA GUN SUPPORT
Now playing
01:18
Protesters hold 'die-in' at grocery store
Now playing
02:03
Activists, NRA wage ad war over gun reform
Now playing
00:57
Newtown student: This is why we're walking out
WASHINGTON, DC - JUNE 22: (AFP OUT) Ivanka Trump participates during  the American Leadership in Emerging Technology Event in the East Room of the White House June 22, 2017 in Washington, DC. (Photo by Olivier Douliery-Pool/Getty Images)
Olivier Douliery/Pool/Getty Images
WASHINGTON, DC - JUNE 22: (AFP OUT) Ivanka Trump participates during the American Leadership in Emerging Technology Event in the East Room of the White House June 22, 2017 in Washington, DC. (Photo by Olivier Douliery-Pool/Getty Images)
Now playing
01:36
Ivanka Trump: Arming teachers 'not a bad idea'
buying guns online orig nws_00003310.jpg
buying guns online orig nws_00003310.jpg
Now playing
01:55
What the law says about buying guns online
(CNN) —  

The Florida State Senate narrowly passed a bill Monday that would raise the age to buy a firearm from 18 to 21, require a three-day waiting period for most gun purchases and ban the sale or possession of bump fire stocks, which can make it easier for a semi-automatic weapon to function like an automatic rifle.

Marjory Stoneman Douglas students return to school two weeks after a mass shooting at the school.
Joe Raedle/Getty Images
Marjory Stoneman Douglas students return to school two weeks after a mass shooting at the school.

The “Marjory Stoneman Douglas High School Public Safety Act” (SB 7026) would also give law enforcement more power to seize weapons and ammunition from those deemed mentally unfit or otherwise a threat, and provide additional funding for armed school resource officers and for mental health services.

The Senate narrowed a controversial provision in the bill that would allow teachers to be armed.

The measure in its entirety still must pass the Florida House.

The issue of arming teachers has been a major point of contention in debate over the bill.

The changes approved by the Senate would exclude those who “exclusively perform classroom duties as classroom teachers” from being allowed to be armed as part of a program renamed the Coach Aaron Feis Guardian Program. Feis was a victim in the February 14 mass shooting at Marjory Stoneman Douglas High School in Parkland.

The limitation, however, does not apply to classroom teachers of a Junior Reserve Officers’ Training Corps program or current service members; and current or former law enforcement officers, according to the bill.

Under the program, school staff members who could be armed must complete 144 hours of training and meet other criteria. The program would be voluntary, implemented only if the sheriff’s department and school district agree. School personnel would not be required to participate.

The Senate passed the bill 20-18. The House was expected to take up the measure Tuesday morning. It was not clear whether or how the House might amend the bill. The Florida legislature ends its session on Friday.

Florida Gov. Rick Scott took issue with some aspects of the proposal. ‎

Scott “is against arming teachers,” said Lauren Schenone, a spokeswoman for the governor.

“Obviously, this amendment (to exclude some staff members from being allowed to be armed) is a step in the right direction. But, the Governor will review the final bill before he makes a decision,” she said.

Schenone said Scott “still has concerns that the bill includes a three-day waiting period. He brought this up during his meetings with Legislators today.”

Gunman Nikolas Cruz killed 17 students and teachers at Stoneman Douglas, including Feis, an assistant football coach who school officials said threw himself in front of students to protect them from oncoming bullets.

Survivors of the shooting and parents of victims have lobbied lawmakers to pass stricter gun control measures.

Before the Senate began debating Monday, parents of victims implored lawmakers to pass legislation that would enhance the safety and security of schools, keeps guns away from those who pose a risk to themselves and others and improve access to mental health resources for at risk youth.

“Our message is simple: We must be the last families to lose loved ones to mass murder in a school. This time must be different, and we demand action,” said Ryan Petty, whose daughter, Alaina Petty, 14, was killed in the shooting.

Survivors called the Senate measure a start but said the work is far from done.

“These are the baby steps we need!! We have a lot further to go, but progress is progress and that’s not to be denied,” Douglas student and outspoken activist Delaney Tarr posted on social media.

Another Douglas student, Ryan Deitsch, tweeted that the legislative effort was like “being up a half time – means nothing until the end.”

CNN’s Amanda Jackson and Jamiel Lynch contributed to this report.