Quite a bit faster now.