Same changes to PeaceFinal