Merge with Chalo fixing small probs