Combining commits 3 and 4 into one.