Further work on debug field
merge!!!!!!