Added problems 17-20