Denver is about to get even more marijuana-friendly. Weed delivery is expected to begin this summer after the Denver City Council unanimously agreed on Monday to overhaul the local industry with two major measures.

The changes have been in the works for several years, and city officials also wanted to make the industry fairer. The first bill will allow pharmacies to hire third-party suppliers to deliver weed direct to customers, and will lift the 2016 cap on recreational donors in Denver, which has 220 branches. Individuals supplying weeds or starting a new business must adhere to the social regulations of the state’s equity criteria.

The second change would legalize bars where customers could smoke their own weed, as well as clubs that could sell small quantities of pot to be smoked. Denver will also be cool with tour buses or shuttles that allow weeds on board.

The council agreed to approve both without discussion.

Eric Escudero, spokesman for the Denver Department of Excise and Licenses, said city officials might be ready to start delivering weeds in late summer, but it’s not clear when the clubs, buses and shuttles would open.

Mayor Michael Hancock supports the measures, said spokesman Mike Strott, and could sign them into law on Tuesday, April 20th, the unofficial weed holiday.