Finish Problem 2
done with draft