Negotiators in the Massachusetts House and Senate struck a deal Wednesday, formulating a compromise bill that would allow transgender individuals to use the bathrooms and some other facilities that match their gender identity. 

Both chambers supported bills with similar language this year. A six-member conference committee, led by Sen. William Brownsberger and Rep. John Fernandes, adopted a provision from the House bill that would instruct the state’s attorney general to develop guidelines to allow a case to be brought against someone asserting a gender identity to use a facility improperly. 

That clause was seen as critical to winning Gov. Charlie Baker’s support for the bill, State House News reported. He’ll still need to sign off on the changes.

That panel also agreed that Attorney General Maura Healey must establish her office’s guidelines by Sept. 1, and that the law will go into full effect on Oct. 1—giving citizens a month to understand how the laws will work, according to the report. 

The House will vote on the compromise Thursday, though it was unclear when the Senate would consider the change.