Some changes
some forgotten