Added more diagnostic statements