Commit partial changes - split our core functions