Added in part d and j