Added C5
Resolve conflict C1 , C2 , C3 , C5