Some changes in code.