Automated .
Better . insertion (Fix mem leaks)