Added stuff to problem 23