Still broken, but I guess it's more efficient.