but could be faster now?