Reorganized non terminals