Updated Changes 2-21