Added Debug Switch