Should be faster too