Yet more speed hackery