Adding Dan as co-author.
Improving deprecation.