More debug logging inserted