Not sure what the hell I just did, but it's way faster now...