More stuff for problem 1