Moved around on DEBUG flags