Some changes, additions, etc.