SECTION 1. Section 35 of chapter 123 of the General Laws, as appearing in the 2018 Official Edition, is hereby amended by striking out, in lines 79 to 85, inclusive, the words “(i) a secure facility for women approved by the department of public health or the department of mental health, if a female; or (ii) the Massachusetts correctional institution at Bridgewater or other such facility as designated by the commissioner of correction, if a male; provided, however, that any person so committed shall be housed and treated separately from persons currently serving a criminal sentence” and inserting in place thereof the following words:- (i) a secure facility approved by the department of public health or the department of mental health, but not a jail or correctional facility; or (ii) if the court makes a specific finding that the only appropriate setting for treatment for the person is a secure facility, then the person may be committed to the Massachusetts correctional institution at Bridgewater or other such facility as designated by the commissioner of correction, if said person is a male currently committed to a correctional facility pursuant to an order issued in a pending criminal case under a provision of law other than this section; provided further, that no later than one year after the effective date of this act all men not currently committed to a correctional facility pursuant to an order issued in a pending criminal case under a provision of law other than this section shall be relocated to a facility licensed or approved by the department of public health or the department of mental health that is not a correctional facility or jail.