more static dispatch and a performance test that went from 2.8 s down to 1.7 s