Craig's changes.