Changes for diagnostics