Made things much faster (hopefully)