Added some speedup stuff