second commit, correct setup