Final changes for PhilZ Recovery