added cases without keywords 'CALC' or 'GRPH'