Slakshma2 b1

pull request from slakshma2_b1