added initial bits for diagnostics