Adding in new changes from Shikhar

Adding new change dir from shikhar