Added the hoover to more tables