Some changes in code