DEBUG macro added