Experimental plan b

DANGER: support for the experimental plan b stuff.