Chandra changes after merging

Chandra changes after merging