Deepali code merged