Revamp manifest hopefully the last time for now.