Added in Dan's contributions.