Added debugging switch