Added question 1 stuff