Update to allow setup once blocks