Added Debug mode