The Florida Senate took another step toward passing a medical marijuana bill Thursday.

The Senate approved the Florida House version of the bill, 31-7, with tinkering. 

The bill implements the medical marijuana amendment that voters passed with 71 percent approval last November.

The bill allows for people with debilitating medical conditions to get a certificate for medical marijuana through a doctor, without a 90 day waiting period.

Users will be able to use cannabis in various ways, including vaping and edibles, but no smoking. 

The bill also increases the number of new dispensaries (now called medical marijuana treatment center) around the state and makes provisions to allow additional dispensaries as the registry of medical marijuana users grows. 

The bill also calls for medical marijuana research to be conducted. 

The bill's supporters say its not perfect, but it's best to get something in place because the industry is evolving.

"Everyone is running around scared of the decisions we are going to make because of the money on the line. This doesn't end tomorrow, said bill sponsor FL Sen. Rob Bradley, R-Orange Park. "We will be dealing with this every session as this product and patients evolve."

House and Senate leaders still need to reach a compromise on some small differences before midnight on Friday, then send the bill to Gov. Scott.

While the bill is closer to what marijuana advocates want, legal action may still be possible. Attorney John Morgan, who helped spearhead the campaign to get the amendment passed, is already threatening legal action.

Some legislators would also like to see smoking allowed. Sen. Jeff Clemens, a Democrat from Lake Worth, said during Thursday's debate on the Senate floor, "is smoking not good for your health? Maybe it isn't but it's better than dying."

Information from the Associated Press was used in this report.