I fold the 3 commits into one