Speed improvement in #20
Huge speed improvement