Updated for problems 18, 24, and  67