applied changes from deepali branch