Library loads MUCH faster now