Dylan's commit on new self branch.