Speed improvements all around
New data files