Adding Diagnostics