Re-enabled the (partially working) closures