- Finalized some fields