Added debugging feature