all commits 3 and 4