Much faster, really. Fixed