Greg's commits added.