Yes, the logic of this flowchart seems to be much superior to the previous model.