Some changes for Jeremy

Changes added to help debug communication error