Revamp manifest for pulling what we need