Fixes #13, speeds up load time