Reduced A matrix gen time

Dropped the gen time a fair amount, without suffering performance drop.