huge commit, vague explanation