Adding Dan's commits.