JMA - moved DEBUG to makefile rather than inline