Fix parts c & d