Some changes from tng