Updated Diagnostics