Made Some changes