Done exercises 2.24 & 2.25