Finalized changes