more diagnostic code etc