WIP more speedup attempts