Made 1-2.c smaller and more effective.