This should have been done 20 years ago.