Corrected 2a and 2c