PP N PM ANNUAL REPORT ON THE PERFORMANCE OF ACTIVITIES OF THE NPM c) Upgrading the provision of healthcare to persons deprived of their liberty In agreement with the Ministry of Health, it is necessary to consider the possibility of increasing the quality of healthcare offered to persons deprived of their liberty, for example through the organisational separation of healthcare provision from the system of justice to the system of healthcare. In addition, it is necessary to ensure a sufficient number of healthcare workers who offer healthcare to persons deprived of their liberty. d) Eliminating normative deficiencies It is necessary to harmonise, as soon as possible, the regulations containing criminal and other provisions with the Criminal Code and complete the adjustment of the Criminal Procedure Act with the Decision of the Constitutional Court which has established unconstitutionality and non-conformity with the European Convention for the Protection of Human Rights and Fundamental Freedoms. It is also necessary to consider a method of a clearer and more specific standardisation of the implementation of special measures of maintaining order and security. II. Measures and activities under the authority of the Ministry of the Interior a) Providing necessary accommodation conditions in police custody units It is necessary, as soon as possible, to provide the necessary accommodation conditions in conformity with the standards of the European Committee for the Prevention of Torture and Inhuman or Degrading Treatment or Punishment (CPT) in all police stations and police administrations and their custody and detention units. b) Systematic organisation of training on the human rights of persons deprived of their liberty Systematic training of police officers must continue on topics such as human rights and prohibition of torture and other cruel, inhuman or degrading treatment or punishment. III. Measures and activities under the authority of the Ministry of Health a) Systematic supervision of the quality of healthcare in the entire prison system In the course of 2013, it is necessary to carry out supervision of the quality of healthcare in the entire prison system. 34