Bring back some of the drippy code