added more diagnostic support