Dan's changes.