12-18  before change