add a bunch of features not in the one-liner version.