Merged avinash's changes to source