Upgraded DEBUG macro