Made the diagnostic model simpler