Improving efficiency of checks and fixing empty gears check