a bit faster, but still a lot to do.