Added DEBUG flag