#157 close to 10x improvement in speed