finished problem 24 and 25