Added more trace printouts