Faster (some of it)