#84 - performance improvements