2017 Updated Diagnostics