Commit changes are per Vanchi's second PR review