Update Dan's changes.