Potential speed ups

But still very slow... let's continue to believe in potential!