I think it should be revised to remove the estimated-2-years-to-die limitation.
Why is this important?
Some deadly and debilitating diseases (like Huntington's take LONGER than 2 years to kill you. If anything - those suffers are in even MORE in need of a Death With Dignity option!