merging changes from asitha