Balota Optimized

Optimized Balota addons.  will test performance.