Combination commit part 2

Commit Friday 9:23 pm