added Debug Mode