Slightly faster now!