Some changes from 98