Added DEBUG code