added more problem 2 stuff