Runs even faster now