Fixed the definitions by section