Actually faster now