[major] proper extension and change of logic