no longer horrifically slow :)