done problem 2 for real this time\!