added some to c
merged c