same type of changes as to 2.18