added more diagnostic info