A/HRC/42/39/Add.1 (a) Amend section 85 of the Narcotic Drugs, Psychotropic Substances and Substance Abuse Act and any other relevant legislation to ensure that drug testing, including the obtaining of a blood or urine sample, can only be undertaken with a warrant approved by a judicial officer; (b) Develop standard operating procedures or other policies requiring the Royal Bhutan Police to ensure that detainees are not interviewed or interrogated while they are, or are suspected to be, under the influence of drugs and/or alcohol, and that all detainees are given access to effective medical treatment while they are experiencing withdrawal symptoms in the early stages of their detention; (c) Amend relevant legislation, including the Narcotic Drugs, Psychotropic Substances and Substance Abuse Act, to ensure that all persons found to be using prohibited drugs and other substances only participate in treatment on a voluntary basis; (d) Amend relevant legislation to ensure that an individual who has been assessed by a treatment assessment panel has: (i) The right to challenge the decision to transfer him or her to compulsory rehabilitation; (ii) The right to legal assistance, if required; (e) Ensure that safeguards against the arbitrary deprivation of liberty are applied to all detainees, including those arrested, detained or charged with drug-related offences. 94. The Working Group recommends that the Government take the following measures in relation to deprivation of liberty on the grounds of psychosocial disability: (a) Increase efforts to provide appropriate medical care in the community to those with psychosocial disabilities, including by raising the numbers and professional capacity of medical professionals who provide care in the psychiatric ward of the National Referral Hospital in Thimphu; (b) Continue providing support to homes and shelters for vulnerable groups, including women and children in difficult circumstances. Such support must involve ensuring that the homes and shelters are regularly monitored to guarantee the ability of residents to readily leave the facility when they wish to do so and that they are being supported to reintegrate into the community. 19