commented out the offensive lines. avi still seems to work.