Some changes with comments