Debug Mode added