Corrected 24 &25