Chainges done for Jim Review Comments