third commit, 3-6 problems