Changes for Jeff's issue.