Added DEBUG blocks