Added debugging mode