Finalized Revamp