30. The Special Rapporteur calls on the Government to take steps to ensure that medical staff in places of detention is independent, by transferring them from the Ministry of Corrections and Legal Assistance to the Ministry of Health and provide training for the forensic medical services in the medical investigation of torture and other forms of ill-treatment. 31. The Special Rapporteur received reports indicating that the NPM has reportedly been unable to oversee all places of detention comprehensively. The Special Rapporteur calls upon the Government to ensure budgetary allocations and equip it with sufficient human and other resources to ensure its effective functioning in accordance with the OPCAT. A/HRC/19/61/Add.3 58 29. The Special Rapporteur notes with appreciation the measures envisaged under the new Code on Imprisonment of October 2010, to address the issues pertinent to prison overcrowding, and encourages the Government to further improve the effectiveness of existing alternatives to pre-trial detention and consider the introduction of new alternatives through encouraging the use of noncustodial measures such as bail, reporting to a police station, or house arrest.