Some changes made in code