Clarification needed on new E/M changes

Good Afternoon,
Have the new changes to office and other outpatient visits combined the separate steps of calculating the diagnosis/management options, type of data and risk into one process? Currently, you will:

• Determine the diagnosis and management options (sored with points)
• Calculate the types and amount of data (scored with points)
• Determine risk based on:
  • Presenting problem
  • Dx procedures ordered
  • Management Options Selected.

These are...

Clarification needed on new E/M changes