State senators left Saturday's marathon session with a voluntary plan to arm teachers in schools and without an assault weapons ban. It goes to the Senate floor for a vote on Monday.

But the overall bill, a response to last month's massacre in Parkland, wasn't approved before Democrats proposed dozens of amendments that would have added serious gun restrictions.

Here are some of the amendments senators wanted, with the senator who proposed it. It's not a complete list. Some senators withdrew their amendments; others were quickly voted down with little or no discussion:

WHAT PASSED

A change in the overall bill that would outlaw the possession of all 'bump stocks,' which convert semi-automatic rifles into nearly-automatic rifles. (Sen. Bill Galvano, R-Bradenton)

Requiring at least 12 hours of diversity training for teachers and staff going through the marshal program. (Sen. Randolph Bracy, D-Orlando)

WHAT FAILED

two-year ban on the sale of AR-15s in Florida, with a request that the Florida Department of Law Enforcement spend the two years researching the weapons. (Sen. Oscar Braynon, D-Miami Gardens)

A two-year ban on the sale of all military-style assault rifles. (Sen. Linda Stewart, D-Orlando)

Ordering FDLE to create a firearms registry. (Sen. Jose Javier Rodriguez, D-Miami)

A statewide ban on assault rifles and high-capacity magazines. (Sen. Linda Stewart, D-Orlando)

Allowing families, in addition to police, to petition a court to have their loved ones' guns temporarily seized. (Sen. Audrey Gibson, D-Jacksonville)

Allowing schools to spend money designated for the 'marshal program' to instead hire school resource officers. (Sen. Bill Montford, D-Tallahassee)

Requiring FDLE to inform local police whenever someone in their area fails a background check. (Sen. Annette Taddeo, D-Miami)

Changing state law to allow cities and counties to set their own gun ordinances. (Sen. Annette Taddeo, D-Miami)

Making it illegal to give or sell a weapon to anyone who is under 21, closing a loophole. (Sen. Darryl Rouson, D-St. Petersburg)

Removing the marshal program from the overall gun bill. (Sen. Oscar Braynon, D-Miami Gardens)

A ban on high-capacity magazines. (Sen. Gary Farmer, D-Lighthouse Point)

Outlawing the sale or possession of "assault weapons" to people under 21, but letting people under 21 possess other rifles and shotguns. (Sen. David Simmons, R-Altamonte Springs)

Requiring people who want a concealed weapons permit to first get a mental health evaluation. (Sen. Daphne Campbell, D-Miami Shores)

Recommending that prosecutors not offer less than a life sentence in plea deals with first-degree murder suspects. (Sen. Tom Lee, R-Thonotosassa)

Removing the marshal program and all gun restrictions from the overall gun bill. (Sen. Tom Lee, R-Thonotosassa)