Performance update

Doesn't always play nice. Needs to be tested on various machines.