Updated code with DEBUG flag
Gathered report
--amend