Added next set of debugging changes