Some changes with intention and comments